diff --git a/app/views/dmsf_upload/_form.html.erb b/app/views/dmsf_upload/_form.html.erb
index 2fac8def..020dd1ed 100644
--- a/app/views/dmsf_upload/_form.html.erb
+++ b/app/views/dmsf_upload/_form.html.erb
@@ -82,7 +82,7 @@
                        :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
                        :upload_path => dmsf_uploads_path(:format => 'js'),
                        :description_placeholder => l(:label_optional_description),
-                       :project => "#{@project.identifier}",
+                       :project => @project ? "#{@project.identifier}" : "",
                        :description => description,
                        :awf => awf
                    } %>
diff --git a/db/migrate/20170421101901_dmsf_file_container_rollback.rb b/db/migrate/20170421101901_dmsf_file_container_rollback.rb
index d9d34595..f3da26c7 100644
--- a/db/migrate/20170421101901_dmsf_file_container_rollback.rb
+++ b/db/migrate/20170421101901_dmsf_file_container_rollback.rb
@@ -69,7 +69,7 @@ class DmsfFileContainerRollback < ActiveRecord::Migration
 
   def down
     # dmsf_files
-    file_folder_ids = DmsfFile.joins(:dmsf_folder).where(:dmsf_folders => { :system => true }).pluck('dmsf_files.id, cast(dmsf_folders.title as int)')
+    file_folder_ids = DmsfFile.joins(:dmsf_folder).where(:dmsf_folders => { :system => true }).pluck('dmsf_files.id, cast(dmsf_folders.title as decimal)')
     remove_index :dmsf_files, :project_id
     rename_column :dmsf_files, :project_id, :container_id
     add_column :dmsf_files, :project_id, :int, :null => true # temporarily added for the save method