diff --git a/app/Http/Controllers/Assets/AssetCheckoutController.php b/app/Http/Controllers/Assets/AssetCheckoutController.php
index bc5465e4b..1fdd0a0cc 100644
--- a/app/Http/Controllers/Assets/AssetCheckoutController.php
+++ b/app/Http/Controllers/Assets/AssetCheckoutController.php
@@ -91,7 +91,8 @@ class AssetCheckoutController extends Controller
 
             $settings = \App\Models\Setting::getSettings();
 
-            if ($settings->full_multiple_companies_support){
+            // We have to check whether $target->company_id is null here since locations don't have a company yet
+            if (($settings->full_multiple_companies_support) && ((!is_null($target->company_id)) &&  (!is_null($asset->company_id)))) {
                 if ($target->company_id != $asset->company_id){
                     return redirect()->to("hardware/$assetId/checkout")->with('error', trans('general.error_user_company'));
                 }
diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
index c239214d8..e2c19880b 100644
--- a/resources/lang/en/general.php
+++ b/resources/lang/en/general.php
@@ -459,7 +459,7 @@ return [
     'serial_number'        => 'Serial Number',
     'item_notes' => ':item Notes',
     'item_name_var' => ':item Name',
-    'error_user_company' => 'User and Asset companies missmatch',
+    'error_user_company' => 'Checkout target company and asset company do not match',
     'error_user_company_accept_view' => 'An Asset assigned to you belongs to a different company so you can\'t accept nor deny it, please check with your manager',
     'importer' => [
         'checked_out_to_fullname' => 'Checked Out to: Full Name',