diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index b80b181..ef1dce4 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -31,7 +31,7 @@ class ApplicationController < ActionController::Base
   end
 
   def redirect_locked_accounts
-    if Current.user && !Current.user.admin? && Current.account.locked?
+    if Current.user && !Current.user.admin? && Current.account.present? && Current.account.locked?
       redirect_to locked_account_path
     end
   end