diff --git a/app/Jobs/Mail/NinjaMailerJob.php b/app/Jobs/Mail/NinjaMailerJob.php
index f3730dece83b..ad58e767eebc 100644
--- a/app/Jobs/Mail/NinjaMailerJob.php
+++ b/app/Jobs/Mail/NinjaMailerJob.php
@@ -63,6 +63,7 @@ class NinjaMailerJob implements ShouldQueue
     {
 
         $this->nmo = $nmo;
+        $this->override = $override;
 
     }
 
diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index 20b2645ef94d..4bf2fa0c3ee2 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -210,7 +210,7 @@ class Import implements ShouldQueue
             $this->{$method}($data[$import]);
         }
 
-        if(Ninja::isHosted())
+        if(Ninja::isHosted() && array_key_exists('ninja_tokens', $data))
             $this->processNinjaTokens($data['ninja_tokens']);
 
         $this->setInitialCompanyLedgerBalances();