diff --git a/app/models/user.rb b/app/models/user.rb
index fe6222359..48254ef90 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -364,7 +364,9 @@ class User < Principal
         end
       end
     end
-    last_login_on = user.last_login_on.nil? ? '' : user.last_login_on.to_s
+    unless user.nil?
+      last_login_on = user.last_login_on.nil? ? '' : user.last_login_on.to_s
+    end
     user.update_column(:last_login_on, Time.now) if user && !user.new_record?
     [user, last_login_on]
   rescue => text