diff --git a/ChangeLog b/ChangeLog
index 253fa61..28c1651 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-07  Mirko Viviani  <mirko.viviani@rccr.cremona.it>
+
+	* EOAccess/EOEntity.m ([EOEntity -isPrimaryKeyValidInObject:]): check for NSNull
+	objects.
+
 2002-12-06  Mirko Viviani  <mirko.viviani@rccr.cremona.it>
 
 	* EOAccess/EOUtilities.h: added prototype.
diff --git a/EOAccess/EOEntity.m b/EOAccess/EOEntity.m
index 32a707a..d46ad94 100644
--- a/EOAccess/EOEntity.m
+++ b/EOAccess/EOEntity.m
@@ -1703,7 +1703,7 @@ NSString *EONextPrimaryKeyProcedureOperation = @"EONextPrimaryKeyProcedureOperat
       NS_DURING
 	{
           value = [object valueForKey: key];
-          if (value == nil || value == [EONull null])
+          if (value == nil || value == [EONull null] || value == [NSNull null])
             isValid = NO;
 	}
       NS_HANDLER