diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ExtentImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ExtentImpl.java
index 37f044d78..1ffc4c1c7 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ExtentImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ExtentImpl.java
@@ -104,14 +104,17 @@ public class ExtentImpl<T>
     }
 
     public int hashCode() {
-        return _extent.hashCode();
+        return ((_extent == null) ? 0  : _extent.hashCode());
     }
 
     public boolean equals(Object other) {
         if (other == this)
             return true;
-        if (!(other instanceof ExtentImpl))
+        if ((other == null) || (other.getClass() != this.getClass()))
             return false;
+        if (_extent == null)
+        	return false;
+        
         return _extent.equals(((ExtentImpl) other)._extent);
 	}
 }