1 files changed, 6 insertions, 4 deletions
diff --git a/perllib/FixMyStreet/App/Model/PhotoSet.pm b/perllib/FixMyStreet/App/Model/PhotoSet.pm
index 41d02d2a7..243675f2c 100644
--- a/perllib/FixMyStreet/App/Model/PhotoSet.pm
+++ b/perllib/FixMyStreet/App/Model/PhotoSet.pm
@@ -176,7 +176,7 @@ has ids => ( #  Arrayref of $fileid tuples (always, so post upload/raw data proc
             }
             my ($fileid, $type) = split /\./, $part;
             $type ||= 'jpeg';
-            if (length($fileid) == 40) {
+            if ($fileid && length($fileid) == 40) {
                 my $file = $self->get_file($fileid, $type);
                 if ($file->exists) {
                     $file->basename;
@@ -185,7 +185,7 @@ has ids => ( #  Arrayref of $fileid tuples (always, so post upload/raw data proc
                     ();
                 }
             } else {
-                warn sprintf "Received bad photo hash of length %d", length($fileid);
+                # A bad hash, probably a bot spamming with bad data.
                 ();
             }
         });
@@ -265,13 +265,15 @@ sub remove_images {
         --$dec;
     }
 
+    $self->delete_cached();
+
+    return undef if !@images;
+
     my $new_set = (ref $self)->new({
         data_items => \@images,
         object => $self->object,
     });
 
-    $self->delete_cached();
-
     return $new_set->data; # e.g. new comma-separated fileid
 }