@@ -765,11 +765,11 @@
 			    [headers keyEnumerator];
 			OFEnumerator OF_GENERIC(OFString *) *objectEnumerator =
 			    [headers objectEnumerator];
 			OFString *key, *object;
 
-			if (statusCode / 100 == 2) {
+			if (statusCode / 100 == 2 && _currentFileName != nil) {
 				[of_stdout writeString: @"  "];
 				[of_stdout writeLine: OF_LOCALIZED(
 				    @"info_name_unaligned",
 				    @"Name: %[name]",
 				    @"name", _currentFileName)];
@@ -779,11 +779,11 @@
 			    (object = [objectEnumerator nextObject]) != nil)
 				[of_stdout writeFormat: @"  %@: %@\n",
 							key, object];
 
 			objc_autoreleasePoolPop(pool);
-		} else if (statusCode / 100 == 2) {
+		} else if (statusCode / 100 == 2 && !_detectFileNameRequest) {
 			[of_stdout writeString: @"  "];
 			[of_stdout writeLine: OF_LOCALIZED(@"info_name",
 			    @"Name: %[name]",
 			    @"name", _currentFileName)];
 			[of_stdout writeString: @"  "];