diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index e256105de35e..8086b3a84558 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -91,6 +91,7 @@ use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Str;
 use Turbo124\Beacon\Facades\LightLogs;
+use Illuminate\Support\Facades\App;
 
 class Import implements ShouldQueue
 {
@@ -244,6 +245,10 @@ class Import implements ShouldQueue
 
         // $this->fixData();
         try{
+            App::forgetInstance('translator');
+            $t = app('translator');
+            $t->replace(Ninja::transformTranslations($this->company->settings));
+        
             Mail::to($this->user->email, $this->user->name())
                 ->send(new MigrationCompleted($this->company, implode("<br>",$check_data)));
         }
diff --git a/app/Repositories/ActivityRepository.php b/app/Repositories/ActivityRepository.php
index ce31e331ce99..ec0beef03b97 100644
--- a/app/Repositories/ActivityRepository.php
+++ b/app/Repositories/ActivityRepository.php
@@ -125,7 +125,7 @@ class ActivityRepository extends BaseRepository
 
         $design = Design::find($entity_design_id);
 
-        if(!$entity->invitations()->exists()){
+        if(!$entity->invitations()->exists() || !$design){
             nlog("No invitations for entity {$entity->id} - {$entity->number}");
             return;
         }