misc fixes to get working in production mode using Thin.

1 files changed, 2 insertions, 1 deletions

diff --git a/app/helpers/navigation_helper.rb b/app/helpers/navigation_helper.rb
index a43eecd..fde6b45 100644
--- a/app/helpers/navigation_helper.rb
+++ b/app/helpers/navigation_helper.rb
@@ -1,7 +1,7 @@
 module NavigationHelper
 
   def has_side_column?
-    if root_page?
+    if root_page? || site.menu.nil?
       return false
     end
     second_level_children_count = site.menu.submenu(current_page_path.first).try(:size)
@@ -13,6 +13,7 @@ module NavigationHelper
   end
 
   def top_level_navigation_links
+    return unless site.menu
     haml do
       first = 'first'
       site.menu.each do |item|