diff --git a/lib/gitlabhq/encode.rb b/lib/gitlabhq/encode.rb
index 55e86192ad4..df40206d5eb 100644
--- a/lib/gitlabhq/encode.rb
+++ b/lib/gitlabhq/encode.rb
@@ -11,6 +11,10 @@ module Gitlabhq
       else
         message
       end.force_encoding("utf-8")
+    # Prevent app from crash cause of 
+    # encoding errors
+    rescue
+      ""
     end
   end
 end