From 31ef397dba9e6e679e7692e7398001cb09446a66 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 23 Oct 2021 15:04:20 +1100
Subject: [PATCH] Return early

---
 app/Http/Controllers/ClientPortal/SwitchCompanyController.php | 2 +-
 app/Mail/Admin/EntityViewedObject.php                         | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/ClientPortal/SwitchCompanyController.php b/app/Http/Controllers/ClientPortal/SwitchCompanyController.php
index 627dd6e18d28..2867541476d6 100644
--- a/app/Http/Controllers/ClientPortal/SwitchCompanyController.php
+++ b/app/Http/Controllers/ClientPortal/SwitchCompanyController.php
@@ -27,7 +27,7 @@ class SwitchCompanyController extends Controller
             ->where('id', $this->transformKeys($contact))
             ->first();
 
-        Auth::guard('contact')->login($client_contact, true);
+        auth()->guard('contact')->user()->login($client_contact, true);
 
         return redirect('/client/dashboard');
     }
diff --git a/app/Mail/Admin/EntityViewedObject.php b/app/Mail/Admin/EntityViewedObject.php
index 90a7588eeebc..4c1004aabb39 100644
--- a/app/Mail/Admin/EntityViewedObject.php
+++ b/app/Mail/Admin/EntityViewedObject.php
@@ -42,6 +42,9 @@ class EntityViewedObject
     public function build()
     {
 
+        if(!$this->entity)
+            return;
+
         App::forgetInstance('translator');
         /* Init a new copy of the translator*/
         $t = app('translator');