diff --git a/lib/web_git.rb b/lib/web_git.rb
index 2fb3e74..66eb3f9 100644
--- a/lib/web_git.rb
+++ b/lib/web_git.rb
@@ -64,7 +64,7 @@ class Server < Sinatra::Base
       @list = []
       # (HEAD -> jw-non-sweet)
       # TODO show where branches are on different remotes
-      @remotes = g.remotes.map {|remote| "#{remote.name}: #{remote.url}"  }
+      @remotes = git.remotes.map {|remote| "#{remote.name}: #{remote.url}"  }
       # (origin/master, origin/jw-non-sweet, origin/HEAD)
       # git.branches[:master].gcommit
 
diff --git a/lib/web_git/graph.rb b/lib/web_git/graph.rb
index cabb182..10d7d3c 100644
--- a/lib/web_git/graph.rb
+++ b/lib/web_git/graph.rb
@@ -29,7 +29,7 @@ def to_hash
     end
 
     def self.project_root
-      if defined?(Rails)
+      if defined?(Rails) && Rails.respond_to?("root")
         return Rails.root
       end