diff --git a/app/Listeners/InvoiceListener.php b/app/Listeners/InvoiceListener.php
index f13a4f2a5f95..9e40bbbe6d6b 100644
--- a/app/Listeners/InvoiceListener.php
+++ b/app/Listeners/InvoiceListener.php
@@ -18,13 +18,15 @@ class InvoiceListener
             return;
         }
 
-        $invoice = $event->invoice;
-        $account = Auth::user()->account;
+        if (Auth::check()) {
+            $invoice = $event->invoice;
+            $account = Auth::user()->account;
 
-        if ($invoice->invoice_design_id
-                && $account->invoice_design_id != $invoice->invoice_design_id) {
-            $account->invoice_design_id = $invoice->invoice_design_id;
-            $account->save();
+            if ($invoice->invoice_design_id
+                    && $account->invoice_design_id != $invoice->invoice_design_id) {
+                $account->invoice_design_id = $invoice->invoice_design_id;
+                $account->save();
+            }
         }
     }
 
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index a5c2e63cb42c..acb6b3a01d02 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -513,7 +513,8 @@ class Invoice extends EntityModel implements BalanceAffecting
                 $dueDateVal = strtotime($this->due_date);
                 $monthVal = (int)date('n', $dueDateVal);
                 $dayVal = (int)date('j', $dueDateVal);
-
+                $dueDate = false;
+                
                 if($monthVal == 1) {// January; day of month
                     $currentDay = (int)date('j', $now);
                     $lastDayOfMonth = (int)date('t', $now);