diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 5c51b58ab..a914eec40 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,6 +1,7 @@
 7.6.14
  - fixed: IE6 shows Admin Bar over Asset Manager
- - fixed: #9808: Search i18n 
+ - fixed #9808: Search i18n 
+ - fixed #9818: deleteAttachedFiles bug (THE REVENGE)
 
 7.6.13
  - fixed AdSpace bug: impressions and clicks for most non-human web clients will not be counted.
diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index e69e9050f..db9f10e31 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -484,9 +484,7 @@ sub deleteAttachedFiles {
             my $form = $self->_createForm($fieldConfig->{$field}, $entryData->{$field});
             if ($form->can('getStorageLocation')) {
                 my $storage = $form->getStorageLocation;
-                if ($storage) {
-                    $storage->delete;
-                }
+                $storage->delete if $storage;
             }
         }
     }
@@ -498,7 +496,7 @@ sub deleteAttachedFiles {
                 my $form = $self->_createForm($fieldConfig->{$field}, $entryData->{$field});
                 if ($form->can('getStorageLocation')) {
                     my $storage = $form->getStorageLocation;
-                    $storage->delete;
+                    $storage->delete if $storage;
                 }
             }
         }