diff --git a/direct/src/distributed/ConnectionRepository.py b/direct/src/distributed/ConnectionRepository.py
index 30860895fd..573e530f3c 100644
--- a/direct/src/distributed/ConnectionRepository.py
+++ b/direct/src/distributed/ConnectionRepository.py
@@ -227,15 +227,10 @@ class ConnectionRepository(
                         self.notify.error("Module %s does not define class %s." % (className, className))
                     classDef = getattr(classDef, className)
 
-                # rhh this seems to fail with new system not sure why ?
-                #print "---classname " +className
-                #print type(classDef)
-                #print types.ClassType
-                #if type(classDef) != types.ClassType:
-                #    self.notify.error("Symbol %s is not a class name." % (className))
-                #else:
-                #    dclass.setClassDef(classDef)
-                dclass.setClassDef(classDef)
+                if type(classDef) != types.ClassType and type(classDef) != types.TypeType:
+                    self.notify.error("Symbol %s is not a class name." % (className))
+                else:
+                    dclass.setClassDef(classDef)
 
             self.dclassesByName[className] = dclass
             if number >= 0:
diff --git a/direct/src/distributed/ServerRepository.py b/direct/src/distributed/ServerRepository.py
index 455e78c359..2a9ae635d2 100644
--- a/direct/src/distributed/ServerRepository.py
+++ b/direct/src/distributed/ServerRepository.py
@@ -149,7 +149,7 @@ class ServerRepository:
                         self.notify.error("Module %s does not define class %s." % (className, className))
                     classDef = getattr(classDef, className)
 
-                if type(classDef) != types.ClassType:
+                if type(classDef) != types.ClassType and type(classDef) != types.TypeType:
                     self.notify.error("Symbol %s is not a class name." % (className))
                 else:
                     dclass.setClassDef(classDef)