From 985fade9f6e39c5224522e375a6e1b56f7ba2eef Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 27 Sep 2011 13:48:16 -0500
Subject: [PATCH] Don't call id on nil

---
 lib/gollum/markup.rb | 2 +-
 lib/gollum/page.rb   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/gollum/markup.rb b/lib/gollum/markup.rb
index 143b2623..e6f490f1 100644
--- a/lib/gollum/markup.rb
+++ b/lib/gollum/markup.rb
@@ -14,7 +14,7 @@ module Gollum
       @wiki    = page.wiki
       @name    = page.filename
       @data    = page.text_data
-      @version = page.version.id
+      @version = page.version.id if page.version
       @format  = page.format
       @dir     = ::File.dirname(page.path)
       @tagmap  = {}
diff --git a/lib/gollum/page.rb b/lib/gollum/page.rb
index 165c2449..a794ff1d 100644
--- a/lib/gollum/page.rb
+++ b/lib/gollum/page.rb
@@ -381,6 +381,7 @@ module Gollum
     #
     # Returns the Page or nil if none exists.
     def find_sub_page(name)
+      return nil unless self.version
       return nil if self.filename =~ /^_/
       name = "_#{name.to_s.capitalize}"
       return nil if page_match(name, self.filename)