diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index 1b0e6cb78b6b..890f5a64fa4f 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -107,11 +107,11 @@ class BaseController extends Controller
           'token',
           'company.activities',
           'company.documents',
-          //'company.users.company_user',
+          'company.users.company_user',
           'company.tax_rates',
           'company.groups',
           'company.payment_terms',
-          'company.designs.company'
+          'company.designs.company',
         ];
 
     public function __construct()
diff --git a/app/Jobs/Util/VersionCheck.php b/app/Jobs/Util/VersionCheck.php
index 56c6ea952238..a01ea0fdbdce 100644
--- a/app/Jobs/Util/VersionCheck.php
+++ b/app/Jobs/Util/VersionCheck.php
@@ -49,7 +49,7 @@ class VersionCheck implements ShouldQueue
             if(!$account)
                 return;
 
-            if($account->plan == 'white_label' && $account->plan_expires->lt(now())){
+            if($account->plan == 'white_label' && $account->plan_expires && $account->plan_expires->lt(now())){
                 $account->plan = null;
                 $account->plan_expires = null;
                 $account->save();