diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 05016d2a7..61f464209 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -7,6 +7,6 @@ class SessionsController < Devise::SessionsController
   before_filter :reset_authentication_token, :only => [:destroy]
 
   def reset_authentication_token
-    current_user.reset_authentication_token!
+    current_user.reset_authentication_token! unless current_user.nil?
   end
 end