diff --git a/app/models/uploaded_file.rb b/app/models/uploaded_file.rb
index ab419bc..0ca6341 100644
--- a/app/models/uploaded_file.rb
+++ b/app/models/uploaded_file.rb
@@ -54,7 +54,7 @@ class UploadedFile < Article
 
   def self.icon_name(article = nil)
     if article
-      article.image? ? article.public_filename(:icon) : article.mime_type.gsub(/[\/+.]/, '-')
+      article.image? ? article.public_filename(:icon) : (article.mime_type ? article.mime_type.gsub(/[\/+.]/, '-') : 'upload-file')
     else
       'upload-file'
     end
diff --git a/test/unit/uploaded_file_test.rb b/test/unit/uploaded_file_test.rb
index 19e11b1..48a07ea 100644
--- a/test/unit/uploaded_file_test.rb
+++ b/test/unit/uploaded_file_test.rb
@@ -287,4 +287,10 @@ class UploadedFileTest < Test::Unit::TestCase
     assert_equal '', f.lead
   end
 
+  should 'survive when try to get icon_name from a file with mime_type nil' do
+    f = UploadedFile.new
+    f.expects(:mime_type).returns(nil)
+    assert_equal 'upload-file', UploadedFile.icon_name(f)
+  end
+
 end
--
libgit2 0.21.2