@@ -168,12 +168,15 @@
 }
 
 -   (void)setObject: (id)object
   forKeyedSubscript: (id)key
 {
-	[self setObject: object
-		 forKey: key];
+	if (object != nil)
+		[self setObject: object
+			 forKey: key];
+	else
+		[self removeObjectForKey: key];
 }
 
 - (void)removeObjectForKey: (id)key
 {
 	OF_UNRECOGNIZED_SELECTOR