@@ -223,13 +223,17 @@
 
 		[headers setObject: date
 			    forKey: @"Date"];
 	}
 
-	if ([headers objectForKey: @"Server"] == nil)
-		[headers setObject: [_server name]
-			    forKey: @"Server"];
+	if ([headers objectForKey: @"Server"] == nil) {
+		OFString *name = [_server name];
+
+		if (name != nil)
+			[headers setObject: name
+				    forKey: @"Server"];
+	}
 
 	keyEnumerator = [headers keyEnumerator];
 	valueEnumerator = [headers objectEnumerator];
 	while ((key = [keyEnumerator nextObject]) != nil &&
 	    (value = [valueEnumerator nextObject]) != nil)