diff --git a/app/assets/stylesheets/gitlab_bootstrap/files.scss b/app/assets/stylesheets/gitlab_bootstrap/files.scss
index cbc58d22203..caaefdb539b 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/files.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/files.scss
@@ -37,20 +37,6 @@
     background:#fff;
     font-size: 11px;
 
-    &.wiki {
-      font-size: 13px;
-      code {
-        padding:0 4px;
-      }
-      padding:20px;
-      h1, h2 {
-        line-height: 46px;
-      }
-      h3, h4 {
-        line-height: 40px;
-      }
-    }
-
     &.image_file {
       background:#eee;
       text-align:center;
diff --git a/app/assets/stylesheets/sections/wiki.scss b/app/assets/stylesheets/sections/wiki.scss
index 40f31490d39..f3fae969c22 100644
--- a/app/assets/stylesheets/sections/wiki.scss
+++ b/app/assets/stylesheets/sections/wiki.scss
@@ -1,3 +1,13 @@
-.wiki{
-  padding: 5px;
+.wiki {
+    font-size: 13px;
+    code {
+        padding:0 4px;
+    }
+    padding:20px;
+    h1, h2 {
+        line-height: 46px;
+    }
+    h3, h4 {
+        line-height: 40px;
+    }
 }
diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index ba993abf7f7..fb3f2c79079 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -176,6 +176,8 @@ module Gitlab
       if commit = @project.commit(identifier)
         link_to(identifier, project_commit_path(@project, commit), html_options.merge(title: CommitDecorator.new(commit).link_title, class: "gfm gfm-commit #{html_options[:class]}"))
       end
+    rescue Grit::NoSuchPathError
+      nil
     end
   end
 end