diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 1f71590459..cc6290e86a 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -67,7 +67,7 @@ class Handler extends ExceptionHandler
      * @throws Throwable
      */
     public function report(Throwable $exception)
-    {
+    {info("errrrrrrrrrrrrrrrrrr");
         if (! Schema::hasTable('accounts')) {
             info('account table not found');
             return;
@@ -101,6 +101,7 @@ class Handler extends ExceptionHandler
 
     private function validException($exception) 
     {
+        info("valid exception = " .$exception->getMessage());
 
         if(strpos($exception->getMessage(), 'file_put_contents') === TRUE)
             return FALSE;
diff --git a/app/Jobs/Entity/CreateEntityPdf.php b/app/Jobs/Entity/CreateEntityPdf.php
index a63b3590b1..b815f483ee 100644
--- a/app/Jobs/Entity/CreateEntityPdf.php
+++ b/app/Jobs/Entity/CreateEntityPdf.php
@@ -164,4 +164,9 @@ class CreateEntityPdf implements ShouldQueue
 
         return $file_path;
     }
+
+    public function failed(\Exception $exception)
+    {
+
+    }
 }
diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index b3b30d3c72..e8aea53950 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -1048,13 +1048,11 @@ class Import implements ShouldQueue
 
             $cgt = ClientGatewayToken::Create($modified);
 
-            $old_user_key = array_key_exists('user_id', $resource) ?? $this->user->id;
+            $key = "client_gateway_tokens_{$resource['id']}";
 
-            $this->ids['client_gateway_tokens'] = [
-                "client_gateway_tokens_{$old_user_key}" => [
-                    'old' => $resource['id'],
-                    'new' => $cgt->id,
-                ],
+            $this->ids['client_gateway_tokens'][$key] = [
+                'old' => $resource['id'],
+                'new' => $cgt->id,
             ];
         }
 
@@ -1079,13 +1077,11 @@ class Import implements ShouldQueue
 
             $task_status = TaskStatus::Create($modified);
 
-            $old_user_key = array_key_exists('user_id', $resource) ?? $this->user->id;
+            $key = "task_statuses_{$resource['id']}";
 
-            $this->ids['task_statuses'] = [
-                "task_statuses_{$old_user_key}" => [
-                    'old' => $resource['id'],
-                    'new' => $task_status->id,
-                ],
+            $this->ids['task_statuses'][$key] = [
+                'old' => $resource['id'],
+                'new' => $task_status->id,
             ];
         }