diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 9588e1ddc..486498e8f 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -24,6 +24,7 @@
  - fixed #10228: Calendar: Weekly re-occurence function not working properly ( Martin Kamerbeek / Oqapi )
  - fixed #9851: New Users have blank profile field privacy settings (United Knowledge)
  - fixed #10208: Account/Inbox.pm site invititations
+ - fixed #10355: Thingy: dirty delete FileField value
 
 7.7.8
  - fixed: Basic Auth doesn't work if password contains colon (Arjan Widlak,
diff --git a/lib/WebGUI/Form/File.pm b/lib/WebGUI/Form/File.pm
index f3946e316..8a123b798 100644
--- a/lib/WebGUI/Form/File.pm
+++ b/lib/WebGUI/Form/File.pm
@@ -222,6 +222,7 @@ sub getValueAsHtml {
 	return '' unless $value;
 	my $location = WebGUI::Storage->get($self->session,$value);
 	my $file = shift @{ $location->getFiles };
+    return '' unless $file;
 	my $fileValue = sprintf qq|<img src="%s" />&nbsp;<a href="%s">%s</a>|, $location->getFileIconUrl($file), $location->getUrl($file), $file; 
 	return $fileValue;
 }