diff --git a/app/controllers/dmsf_upload_controller.rb b/app/controllers/dmsf_upload_controller.rb
index 32732e23..8dfb2077 100644
--- a/app/controllers/dmsf_upload_controller.rb
+++ b/app/controllers/dmsf_upload_controller.rb
@@ -122,7 +122,7 @@ class DmsfUploadController < ApplicationController
         
         # Need to save file first to generate id for it in case of creation. 
         # File id is needed to properly generate revision disk filename
-        if file.save
+        if new_revision.valid? && file.save
           new_revision.disk_filename = new_revision.new_storage_filename
         else
           failed_uploads.push(commited_file)