diff --git a/app/Http/Controllers/PreviewController.php b/app/Http/Controllers/PreviewController.php
index 13a5daf43148..c99a4a400fe8 100644
--- a/app/Http/Controllers/PreviewController.php
+++ b/app/Http/Controllers/PreviewController.php
@@ -188,19 +188,19 @@ class PreviewController extends BaseController
 
         if ($request->input('entity') == 'quote') {
             $repo = new QuoteRepository();
-            $entity_obj = QuoteFactory::create($company->id, auth()->user()->id);
+            $entity_obj = QuoteFactory::create($company->id, $user->id);
             $class = Quote::class;
         } elseif ($request->input('entity') == 'credit') {
             $repo = new CreditRepository();
-            $entity_obj = CreditFactory::create($company->id, auth()->user()->id);
+            $entity_obj = CreditFactory::create($company->id, $user->id);
             $class = Credit::class;
         } elseif ($request->input('entity') == 'recurring_invoice') {
             $repo = new RecurringInvoiceRepository();
-            $entity_obj = RecurringInvoiceFactory::create($company->id, auth()->user()->id);
+            $entity_obj = RecurringInvoiceFactory::create($company->id, $user->id);
             $class = RecurringInvoice::class;
         } else { //assume it is either an invoice or a null object
             $repo = new InvoiceRepository();
-            $entity_obj = InvoiceFactory::create($company->id, auth()->user()->id);
+            $entity_obj = InvoiceFactory::create($company->id, $user->id);
             $class = Invoice::class;
         }
 
diff --git a/app/Jobs/Company/CompanyExport.php b/app/Jobs/Company/CompanyExport.php
index 080ef471c8b3..b41b4ed2ef4d 100644
--- a/app/Jobs/Company/CompanyExport.php
+++ b/app/Jobs/Company/CompanyExport.php
@@ -460,7 +460,9 @@ class CompanyExport implements ShouldQueue
         $zip->close();
 
         Storage::disk(config('filesystems.default'))->put('backups/'.$file_name, file_get_contents($zip_path));
-        unlink($zip_path);        
+
+        if(file_exists($zip_path))
+            unlink($zip_path);        
 
         if(Ninja::isSelfHost())
             $storage_path = 'backups/'.$file_name;
@@ -489,7 +491,9 @@ class CompanyExport implements ShouldQueue
 
         if (Ninja::isHosted()) {
             sleep(3);
-            unlink($zip_path);
+            
+            if(file_exists($zip_path))
+                unlink($zip_path);
         }
     }
 }