diff --git a/ChangeLog b/ChangeLog
index e8a6cb603..36f02d6b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@
 	* Tools/gdomap.c: many changes ... several fixes to work on mingw
 	rewrite some clumsy inefficient code, make variables and functions
 	local. etc.
+	* Source/NSUnarchiver.m: ([versionForClassNameL]) return NSNotFound
+	if the class name was not present.
 
 Mon Feb 25 15:26:38 2002  Nicola Pero  <nicola@brainstorm.co.uk>
 
diff --git a/Source/NSUnarchiver.m b/Source/NSUnarchiver.m
index 85c663282..cc849d7cc 100644
--- a/Source/NSUnarchiver.m
+++ b/Source/NSUnarchiver.m
@@ -1132,6 +1132,10 @@ static Class NSDataMallocClass;
   NSUnarchiverObjectInfo	*info;
 
   info = [objDict objectForKey: className];
+  if (info == nil)
+    {
+      return NSNotFound;
+    }
   return info->version;
 }