@@ -57,14 +57,12 @@
 #endif
 		/* FIXME: Maybe another exception would be better */
 		@throw [OFInvalidArgumentException newWithClass: self
 						    andSelector: _cmd];
 
-	if (obj != nil)
-		[obj retain];
-	if (old != nil)
-		[old release];
+	[obj retain];
+	[old release];
 
 	return self;
 }
 
 + (id)objectForTLSKey: (OFTLSKey*)key