diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index ed1cd61fe..53d826178 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -142,6 +142,7 @@ sub formbuilder (@) { #{{{
 				if (! defined $fh || ! ref $fh) {
 					# even that doesn't always work,
 					# fall back to opening the tempfile
+					$fh=undef;
 					open($fh, "<", $tempfile) || error("failed to open $tempfile: $!");
 				}
 			}
diff --git a/doc/bugs/attachment:_failed_to_get_filehandle.mdwn b/doc/bugs/attachment:_failed_to_get_filehandle.mdwn
index 8a9e1dde0..765082cf9 100644
--- a/doc/bugs/attachment:_failed_to_get_filehandle.mdwn
+++ b/doc/bugs/attachment:_failed_to_get_filehandle.mdwn
@@ -70,6 +70,8 @@ the error message like below:
 
 >>>>>>>> I can rebuild Debian stable source package with CGI for Perl. Maybe it will help me? What do you think? --[[Paweł|ptecza]]
 
+>>>>>>>>> Silly thinko on my part, fixed that in git.. --[[Joey]]
+
 The same message I can see in the Apache log file. There is also
 following warning: