diff --git a/app/Console/Commands/TypeCheck.php b/app/Console/Commands/TypeCheck.php
index 6665cf5d8678..108800e7c0b2 100644
--- a/app/Console/Commands/TypeCheck.php
+++ b/app/Console/Commands/TypeCheck.php
@@ -125,7 +125,7 @@ class TypeCheck extends Command
     {
         $this->logMessage(date('Y-m-d h:i:s').' Checking Company => ' . $company->present()->name(). " " . $company->id);
 
-            $company->saveSettings($company->settings, $company);
+            $company->saveSettings((array)$company->settings, $company);
 
     }
 
@@ -135,7 +135,7 @@ class TypeCheck extends Command
         $this->logMessage(date('Y-m-d h:i:s').' Checking all clients and companies.');
 
         Client::cursor()->each( function ($client) {
-
+            $this->logMessage("Checking client {$client->id}");
             $entity_settings = $this->checkSettingType($client->settings);
             $entity_settings->md5 = md5(time());
             $client->settings = $entity_settings;
@@ -144,7 +144,7 @@ class TypeCheck extends Command
         });
 
         Company::cursor()->each( function ($company) {
-
+            $this->logMessage("Checking company {$company->id}");
             $company->saveSettings($company->settings, $company);
             
         });
diff --git a/app/Utils/Traits/CompanySettingsSaver.php b/app/Utils/Traits/CompanySettingsSaver.php
index d2b370bd9d31..e210c2ab0dda 100644
--- a/app/Utils/Traits/CompanySettingsSaver.php
+++ b/app/Utils/Traits/CompanySettingsSaver.php
@@ -63,8 +63,19 @@ trait CompanySettingsSaver
         {
         //this pass will handle any null values that are in the translations
             foreach ($settings->translations as $key => $value) {
-                if (is_null($settings->translations[$key])) {
-                    $settings->translations[$key] = '';
+
+                if(is_array($settings->translations))
+                {
+                    if (is_null($settings->translations[$key])) {
+                        $settings->translations[$key] = '';
+                    }
+                }
+                elseif(is_object($settings->translations)){
+                    
+                    if (is_null($settings->translations->{$key})) {
+                        $settings->translations->{$key} = '';
+                    }
+                    
                 }
             }