diff --git a/lib/WebGUI/Form/Image.pm b/lib/WebGUI/Form/Image.pm
index c8f5a71aa..9cd30f1a7 100644
--- a/lib/WebGUI/Form/Image.pm
+++ b/lib/WebGUI/Form/Image.pm
@@ -145,13 +145,15 @@ sub getValueFromPost {
 	if (defined $id) {
 		my $storage = WebGUI::Storage::Image->get($self->session, $id);
 		if (defined $storage) {
+			my $atLeastOneImage = 0;
 			foreach my $file (@{$storage->getFiles}) {
 				if ($storage->isImage($file)) {
 					$storage->generateThumbnail($file);
+					$atLeastOneImage = 1;
 				}
 				elsif ($self->get("forceImageOnly")) {
-					$storage->delete;
-					$id = undef;
+					$storage->deleteFile($file);
+					$id = undef unless $atLeastOneImage;
 				}
 			}
 		}