diff --git a/src/org/zoodb/internal/DataDeSerializer.java b/src/org/zoodb/internal/DataDeSerializer.java
index c39ce765..6d3e8144 100644
--- a/src/org/zoodb/internal/DataDeSerializer.java
+++ b/src/org/zoodb/internal/DataDeSerializer.java
@@ -1050,6 +1050,10 @@ private final Object hollowForOid(long oid, ZooClassDef clsDef) {
            	while (clsDef.getNextVersion() != null) {
         		clsDef = clsDef.getNextVersion();
         	}
+           	if (clsDef.getJavaClass() == null) {
+				throw DBLogger.newUser("Class has not been fully evolved (" + 
+						Util.oidToString(oid) + "): " + clsDef);
+			} 
  	        obj = createInstance(clsDef.getJavaClass());
 	        prepareObject((ZooPC) obj, oid, true, clsDef);
         }