diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 1acb257b5..37ea1f9f9 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -3,6 +3,7 @@
    unmodified has been moved to the configuration file under the
    "exportBianryExtensions" field.
  - fixed: some default assets have ids shorter than 22 characters
+ - fixed: failure when submitting a dataform that sends mail with an empty file field
 
 7.6.0
  - added: users may now customize the post received page for the CS
diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index aa3095f05..34fcc2a17 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -485,7 +485,9 @@ sub getAttachedFiles {
         my $form = $self->_createForm($field, $entryData->{$field->{name}});
         if ($form->can('getStorageLocation')) {
             my $storage = $form->getStorageLocation;
-            push @paths, $storage->getPath($storage->getFiles->[0]);
+            if ($storage) {
+                push @paths, $storage->getPath($storage->getFiles->[0]);
+            }
         }
     }
     return \@paths;