diff --git a/Source/BinaryCStream.m b/Source/BinaryCStream.m
index b9ebd3d9c..4acf22991 100644
--- a/Source/BinaryCStream.m
+++ b/Source/BinaryCStream.m
@@ -329,9 +329,11 @@ static BOOL debug_binary_coder;
 - (void) decodeName: (id <String> *)n
 {
 #if 1
-  *n = nil;
+  if (n)
+    *n = nil;
 #else
-  *n = [[[NSString alloc] init] autorelease];
+  if (n)
+    *n = [[[NSString alloc] init] autorelease];
 #endif
 }