diff --git a/lib/gitlab/merge.rb b/lib/gitlab/merge.rb
index 51a71e55..bf7aaa51 100644
--- a/lib/gitlab/merge.rb
+++ b/lib/gitlab/merge.rb
@@ -65,6 +65,8 @@ module Gitlab
           end
         end
       end
+    rescue Errno::ENOMEM => ex
+      Gitlab::GitLogger.error(ex.message)
     rescue Grit::Git::GitTimeout
       return false
     end