diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1962b7d34..9219bdd67 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -16,8 +16,10 @@ class ApplicationController < ActionController::Base
   end
   
   def set_friends_and_status
-    @groups = current_user.groups
-    @friends = current_user.friends
+    if current_user
+      @groups = current_user.groups
+      @friends = current_user.friends
+    end
   end
 
   def count_requests