diff --git a/ChangeLog b/ChangeLog
index 950a64db5..62dd4f342 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-18  Manuel Guesdon <mguesdon@orange-concept.com>
+
+	* Source/NSKeyValueCoding.m: fix exception userInfo
+	
 2004-06-16  Willem Rein Oudshoorn  <Wim.Oudshoorn@agilisys.com>
 
 	* Tools/gdomap.c (map_add): Fix off by one bug that causes
diff --git a/Source/NSKeyValueCoding.m b/Source/NSKeyValueCoding.m
index 8926a117b..661cc89b9 100644
--- a/Source/NSKeyValueCoding.m
+++ b/Source/NSKeyValueCoding.m
@@ -83,7 +83,7 @@ NSString* const NSUnknownKeyException = @"NSUnknownKeyException";
   NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
 				     self, 
 				     @"NSTargetObjectUserInfoKey", 
-				     aKey,
+				     (aKey ? aKey : @"(nil)"),
 				     @"NSUnknownUserInfoKey",
 				     nil];
   NSException *exp = [NSException exceptionWithName: NSUnknownKeyException
@@ -105,9 +105,9 @@ NSString* const NSUnknownKeyException = @"NSUnknownKeyException";
 - (void) handleTakeValue: (id)anObject forUnboundKey: (NSString*)aKey
 {
   NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
-				     anObject, 
+				     (anObject ? anObject : @"(nil)"), 
 				     @"NSTargetObjectUserInfoKey", 
-				     aKey,
+				     (aKey ? aKey : @"(nil)"),
 				     @"NSUnknownUserInfoKey",
 				     nil];
   NSException *exp = [NSException exceptionWithName: NSUnknownKeyException