diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 7c60c7164..dd4c6d86f 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -525,9 +525,7 @@ class Attachment < ActiveRecord::Base
 
   # Physically deletes the file from the file system
   def delete_from_disk!
-    if disk_filename.present? && File.exist?(diskfile)
-      File.delete(diskfile)
-    end
+    FileUtils.rm_f(diskfile) if disk_filename.present?
     Dir[thumbnail_path("*")].each do |thumb|
       File.delete(thumb)
     end
diff --git a/lib/redmine/thumbnail.rb b/lib/redmine/thumbnail.rb
index 3cd978c8e..2f9b41ce8 100644
--- a/lib/redmine/thumbnail.rb
+++ b/lib/redmine/thumbnail.rb
@@ -43,9 +43,7 @@ module Redmine
         return nil if is_pdf && mime_type != "application/pdf"
 
         directory = File.dirname(target)
-        unless File.exist?(directory)
-          FileUtils.mkdir_p directory
-        end
+        FileUtils.mkdir_p directory
         size_option = "#{size}x#{size}>"
 
         if is_pdf
diff --git a/lib/redmine/utils.rb b/lib/redmine/utils.rb
index c54311239..55fbbbfb3 100644
--- a/lib/redmine/utils.rb
+++ b/lib/redmine/utils.rb
@@ -51,9 +51,7 @@ module Redmine
 
       def save_upload(upload, path)
         directory = File.dirname(path)
-        unless File.exist?(directory)
-          FileUtils.mkdir_p directory
-        end
+        FileUtils.mkdir_p directory
         File.open(path, "wb") do |f|
           if upload.respond_to?(:read)
             buffer = ""