diff --git a/ChangeLog b/ChangeLog
index af0e314d6..7d0f0867c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-01  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSOutlineView.m (-reloadItem:reloadChildren:): Convert
+	possible NSNull key to nil.
+
 2004-06-28  Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* Headers/Additions/GNUstepGUI/GSNibTemplates.h: Updated the 
diff --git a/Source/NSOutlineView.m b/Source/NSOutlineView.m
index 0d8a5e844..abe2d527f 100644
--- a/Source/NSOutlineView.m
+++ b/Source/NSOutlineView.m
@@ -611,6 +611,7 @@ static NSImage *unexpandable  = nil;
 
       if ((index = [childArray indexOfObject: object]) != NSNotFound)
 	{
+	  parent = (parent == [NSNull null])?nil:parent;
 	  dsobj = [_dataSource outlineView: self
 			       child: index
 			       ofItem: parent];