diff --git a/app/assets/stylesheets/sections/tree.scss b/app/assets/stylesheets/sections/tree.scss
index def440c..ffde6aa 100644
--- a/app/assets/stylesheets/sections/tree.scss
+++ b/app/assets/stylesheets/sections/tree.scss
@@ -97,7 +97,7 @@
 
 .tree-btn-group {
   .btn {
-    margin-right:-3px;
+    margin-right: 0px;
     padding: 2px 10px;
   }
 }
diff --git a/app/views/blob/_actions.html.haml b/app/views/blob/_actions.html.haml
index 1da39e7..456c743 100644
--- a/app/views/blob/_actions.html.haml
+++ b/app/views/blob/_actions.html.haml
@@ -8,5 +8,5 @@
     - if current_page? project_blame_path(@project, @id)
       = link_to "normal view", project_blob_path(@project, @id), class: "btn btn-tiny"
     - else
-      = link_to "blame", project_blame_path(@project, @id), class: "btn btn-tiny"
+      = link_to "blame", project_blame_path(@project, @id), class: "btn btn-tiny" unless @blob.empty?
   = link_to "history", project_commits_path(@project, @id), class: "btn btn-tiny"
diff --git a/lib/gitlab/git/blame.rb b/lib/gitlab/git/blame.rb
index d6e988b..d7282c5 100644
--- a/lib/gitlab/git/blame.rb
+++ b/lib/gitlab/git/blame.rb
@@ -6,13 +6,14 @@ module Gitlab
 
       def initialize(repository, sha, path)
         @repository, @sha, @path = repository, sha, path
-
       end
 
       def each
         raw_blame = Grit::Blob.blame(repository.repo, sha, path)
 
         raw_blame.each do |commit, lines|
+          next unless commit
+
           commit = Gitlab::Git::Commit.new(commit)
           yield(commit, lines)
         end
--
libgit2 0.21.2