diff --git a/app/controllers/dmsf_controller.rb b/app/controllers/dmsf_controller.rb
index 56d7c15f..dc5c4015 100644
--- a/app/controllers/dmsf_controller.rb
+++ b/app/controllers/dmsf_controller.rb
@@ -486,7 +486,7 @@ class DmsfController < ApplicationController
         unless folder.delete commit
           flash[:error] = folder.errors.full_messages.to_sentence
         end
-      else
+      elsif !commit
         raise FileNotFound
       end
     end
@@ -501,7 +501,7 @@ class DmsfController < ApplicationController
         else
           not_deleted_files << file
         end
-      else
+      elsif !commit
         raise FileNotFound
       end
     end