Index: xotcl/library/store/XOTclSdbm/xotclsdbm.c
===================================================================
diff -u -r2846921e448d4d4aeb3245ebbfe4381182f0e286 -r1aa7246cc8e44078c9dbd33e03992478615f314f
--- xotcl/library/store/XOTclSdbm/xotclsdbm.c	(.../xotclsdbm.c)	(revision 2846921e448d4d4aeb3245ebbfe4381182f0e286)
+++ xotcl/library/store/XOTclSdbm/xotclsdbm.c	(.../xotclsdbm.c)	(revision 1aa7246cc8e44078c9dbd33e03992478615f314f)
@@ -377,8 +377,8 @@
     if (Tcl_PkgRequire(in, "xotcl::store", 0, 0) == NULL) {
         return TCL_ERROR;
     }
-    result = Tcl_VarEval (in, "Class create Storage=Sdbm -superclass Storage",
-			  (char*) 0);
+    result = Tcl_VarEval (in, "::xotcl::Class create Storage=Sdbm -superclass Storage",
+			  (char *) NULL);
     if (result != TCL_OK)
       return result;
     /*{
@@ -389,6 +389,10 @@
       }*/
 
     cl = XOTclGetClass(in, "Storage=Sdbm");
+    if (!cl) {
+      return TCL_ERROR;
+    }
+
     XOTclAddIMethod(in, cl, "open", XOTclSdbmOpenMethod, 0, 0);
     XOTclAddIMethod(in, cl, "close", XOTclSdbmCloseMethod, 0, 0);
     XOTclAddIMethod(in, cl, "set", XOTclSdbmSetMethod, 0, 0);