diff --git a/config/initializers/gitlabhq/20_grit_ext.rb b/config/initializers/gitlabhq/20_grit_ext.rb
index d9f2c001..a8c97b10 100644
--- a/config/initializers/gitlabhq/20_grit_ext.rb
+++ b/config/initializers/gitlabhq/20_grit_ext.rb
@@ -11,6 +11,9 @@ end
 Grit::GitRuby::Internal::RawObject.class_eval do
   def content
     transcoding(@content)
+  rescue Exception => ex
+    Rails.logger.error ex.message
+    @content
   end
 
   private