From 35b4ce2081384e1c8c91e96f1de4ed6d0824ea98 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 16 Aug 2015 17:33:30 +0300
Subject: [PATCH] Bug fixes

---
 app/Listeners/HandleUserSettingsChanged.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Listeners/HandleUserSettingsChanged.php b/app/Listeners/HandleUserSettingsChanged.php
index f15966db9764..993e30141db0 100644
--- a/app/Listeners/HandleUserSettingsChanged.php
+++ b/app/Listeners/HandleUserSettingsChanged.php
@@ -27,11 +27,13 @@ class HandleUserSettingsChanged {
 	 */
 	public function handle(UserSettingsChanged $event)
 	{
-        $account = Auth::user()->account;
-        $account->loadLocalizationSettings();
+        if (Auth::check()) {
+            $account = Auth::user()->account;
+            $account->loadLocalizationSettings();
 
-        $users = $this->accountRepo->loadAccounts(Auth::user()->id);
-        Session::put(SESSION_USER_ACCOUNTS, $users);
+            $users = $this->accountRepo->loadAccounts(Auth::user()->id);
+            Session::put(SESSION_USER_ACCOUNTS, $users);
+        }
 	}
 
 }