diff --git a/lib/gollum/wiki.rb b/lib/gollum/wiki.rb
index c8a4ee2c..e1d265cd 100644
--- a/lib/gollum/wiki.rb
+++ b/lib/gollum/wiki.rb
@@ -237,6 +237,8 @@ module Gollum
       tree_map_for(ref || 'master').inject(0) do |num, entry|
         num + (@page_class.valid_page_name?(entry.name) ? 1 : 0)
       end
+    rescue Grit::GitRuby::Repository::NoSuchShaFound
+      0
     end
 
     # Public: Search all pages for this wiki.