Index: xotcl/library/store/XOTclSdbm/xotclsdbm.c
===================================================================
diff -u -rad8a63234e44a8788efede276e811051ab891fbe -rbb3c756fb47517596b9dbcb4e580aa1212827b41
--- xotcl/library/store/XOTclSdbm/xotclsdbm.c	(.../xotclsdbm.c)	(revision ad8a63234e44a8788efede276e811051ab891fbe)
+++ xotcl/library/store/XOTclSdbm/xotclsdbm.c	(.../xotclsdbm.c)	(revision bb3c756fb47517596b9dbcb4e580aa1212827b41)
@@ -377,7 +377,7 @@
     if (Tcl_PkgRequire(in, "xotcl::store", 0, 0) == NULL) {
         return TCL_ERROR;
     }
-    result = Tcl_VarEval (in, "Class create Storage=Sdbm -superclass Storage",
+    result = Tcl_VarEval (in, "::xotcl::Class create Storage=Sdbm -superclass Storage",
 			  (char*) 0);
     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);