diff --git a/ChangeLog b/ChangeLog
index e0a3906f9..9b8c265bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-31  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Tools/NSKeyValueCoding.m: Minor fix for backward compatibility in
+	([setNilValueForKey:]).
+
 2007-05-30  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Tools/gdomap.m: Don't trap abort signal.
diff --git a/Source/NSKeyValueCoding.m b/Source/NSKeyValueCoding.m
index 75b38eebd..c7bc3ab96 100644
--- a/Source/NSKeyValueCoding.m
+++ b/Source/NSKeyValueCoding.m
@@ -270,10 +270,13 @@ static id ValueForKey(NSObject *self, const char *key, unsigned size)
     {
       [self unableToSetNilForKey: aKey];
     }
-
-  [NSException raise: NSInvalidArgumentException
-	      format: @"%@ -- %@ 0x%x: Given nil value to set for key \"%@\"",
-    NSStringFromSelector(_cmd), NSStringFromClass([self class]), self, aKey];
+  else
+    {
+      [NSException raise: NSInvalidArgumentException
+        format: @"%@ -- %@ 0x%x: Given nil value to set for key \"%@\"",
+        NSStringFromSelector(_cmd), NSStringFromClass([self class]),
+        self, aKey];
+    }
 }