diff --git a/lib/gollum/page.rb b/lib/gollum/page.rb
index 0138902c..83aaba90 100644
--- a/lib/gollum/page.rb
+++ b/lib/gollum/page.rb
@@ -200,12 +200,11 @@ module Gollum
     #
     # Returns a Gollum::Page or nil if the page could not be found.
     def find(name, version)
-      commit = @wiki.repo.commit(version)
-      if page = find_page_in_tree(commit.tree, name)
-        page.version = commit
-        page
-      else
-        nil
+      if commit = @wiki.repo.commit(version)
+        if page = find_page_in_tree(commit.tree, name)
+          page.version = commit
+          page
+        end
       end
     end
 
diff --git a/test/test_page.rb b/test/test_page.rb
index d4fc207d..31c873a8 100644
--- a/test/test_page.rb
+++ b/test/test_page.rb
@@ -45,6 +45,10 @@ context "Page" do
     assert_nil @wiki.page('I do not exist')
   end
 
+  test "no version match" do
+    assert_nil @wiki.page('Bilbo Baggins', 'I do not exist')
+  end
+
   test "no ext match" do
     assert_nil @wiki.page('Data')
   end