diff --git a/app/Utils/Traits/GeneratesCounter.php b/app/Utils/Traits/GeneratesCounter.php
index 5f92265214af..4175acbe55e9 100644
--- a/app/Utils/Traits/GeneratesCounter.php
+++ b/app/Utils/Traits/GeneratesCounter.php
@@ -122,7 +122,7 @@ trait GeneratesCounter
         switch ($entity) {
             case Invoice::class:
                 return 'invoice_number_counter';
-                break;
+                
             case Quote::class:
 
                 if ($this->hasSharedCounter($client, 'quote')) {
@@ -130,40 +130,35 @@ trait GeneratesCounter
                 }
 
                 return 'quote_number_counter';
-                break;
+                
             case RecurringInvoice::class:
                 return 'recurring_invoice_number_counter';
-                break;
+                
             case RecurringQuote::class:
                 return 'recurring_quote_number_counter';
-                break;
+                
             case RecurringExpense::class:
                 return 'recurring_expense_number_counter';
-                break;
+                
             case Payment::class:
                 return 'payment_number_counter';
-                break;
+                
             case Credit::class:
                 if ($this->hasSharedCounter($client, 'credit')) {
                     return 'invoice_number_counter';
                 }
 
                 return 'credit_number_counter';
-                break;
+                
             case Project::class:
                 return 'project_number_counter';
-                break;
+                
             case PurchaseOrder::class:
                 return 'purchase_order_number_counter';
-                break;
-
-            case PurchaseOrder::class:
-                return 'purchase_order_number_counter';
-                break;
 
             default:
                 return 'default_number_counter';
-                break;
+
         }
     }
 
@@ -401,9 +396,8 @@ trait GeneratesCounter
             return (bool) $client->getSetting('shared_invoice_quote_counter');
         }
 
-        if ($type == 'credit') {
-            return (bool) $client->getSetting('shared_invoice_credit_counter');
-        }
+        //credit
+        return (bool) $client->getSetting('shared_invoice_credit_counter');    
     }
 
     /**
diff --git a/app/Utils/Traits/MakesDates.php b/app/Utils/Traits/MakesDates.php
index 629c6731cdd2..797b545e9ffd 100644
--- a/app/Utils/Traits/MakesDates.php
+++ b/app/Utils/Traits/MakesDates.php
@@ -70,7 +70,7 @@ trait MakesDates
 
     /**
      * Formats a datedate.
-     * @param  Carbon|string $date   Carbon object or date string
+     * @param  $date   Carbon object or date string
      * @param  string $format The date display format
      * @return string         The formatted date
      */
diff --git a/app/Utils/Traits/MakesInvoiceHtml.php b/app/Utils/Traits/MakesInvoiceHtml.php
index df9c836808ce..642d5f5dadf5 100644
--- a/app/Utils/Traits/MakesInvoiceHtml.php
+++ b/app/Utils/Traits/MakesInvoiceHtml.php
@@ -63,7 +63,7 @@ trait MakesInvoiceHtml
                 ob_end_clean();
             }
 
-            throw new \Exception($e);
+            throw new \Exception($e->getMessage());
         }
 
         return ob_get_clean();
diff --git a/app/Utils/Traits/MakesTemplateData.php b/app/Utils/Traits/MakesTemplateData.php
index 9c019bb0f652..e9b35cab75ac 100644
--- a/app/Utils/Traits/MakesTemplateData.php
+++ b/app/Utils/Traits/MakesTemplateData.php
@@ -173,7 +173,7 @@ trait MakesTemplateData
         $data['$company.id_number'] = ['value' => 'ID-NO-#434', 'label' => ctrans('texts.id_number')];
         $data['$company.website'] = ['value' => 'https://invoiceninja.com', 'label' => ctrans('texts.website')];
         $data['$company.address'] = ['value' => '5 Kalamazoo Way\n Jimbuckeroo\n USA 90210', 'label' => ctrans('texts.address')];
-        $data['$company.logo'] = ['value' => "<img src='https://raw.githubusercontent.com/hillelcoren/invoice-ninja/master/public/images/round_logo.png' class='w-48' alt='logo'>" ?: '&nbsp;', 'label' => ctrans('texts.logo')];
+        $data['$company.logo'] = ['value' => "<img src='https://raw.githubusercontent.com/hillelcoren/invoice-ninja/master/public/images/round_logo.png' class='w-48' alt='logo'>", 'label' => ctrans('texts.logo')];
         $data['$company_logo'] = &$data['$company.logo'];
         $data['$company1'] = ['value' => 'Company Custom Value 1', 'label' => 'company label1'];
         $data['$company2'] = ['value' => 'Company Custom Value 2', 'label' => 'company label2'];
diff --git a/app/Utils/VendorHtmlEngine.php b/app/Utils/VendorHtmlEngine.php
index cbea4bb4fac0..a7d3595abb38 100644
--- a/app/Utils/VendorHtmlEngine.php
+++ b/app/Utils/VendorHtmlEngine.php
@@ -137,7 +137,7 @@ class VendorHtmlEngine
         $data['$payment_due'] = ['value' => $this->translateDate($this->entity->due_date, $this->company->date_format(), $this->company->locale()) ?: '&nbsp;', 'label' => ctrans('texts.payment_due')];
         $data['$poNumber'] = ['value' => $this->entity->po_number, 'label' => ctrans('texts.po_number')];
 
-        $data['$entity.datetime'] = ['value' => $this->formatDatetime($this->entity->created_at, $this->company->date_format(), $this->company->locale()), 'label' => ctrans('texts.date')];
+        $data['$entity.datetime'] = ['value' => $this->formatDatetime($this->entity->created_at, $this->company->date_format()), 'label' => ctrans('texts.date')];
 
         $data['$entity'] = ['value' => '', 'label' => ctrans('texts.purchase_order')];
         $data['$number'] = ['value' => $this->entity->number ?: '&nbsp;', 'label' => ctrans('texts.purchase_order_number')];
diff --git a/psalm.xml b/psalm.xml
index 2c1858a64e00..52f15a658480 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -15,7 +15,8 @@
 
 <issueHandlers>
   <MissingPropertyType errorLevel="suppress" />
-
+  <TypeDoesNotContainNull errorLevel="suppress" />
+  <TypeDoesNotContainType errorLevel="suppress" />
   <UndefinedFunction>
     <errorLevel type="suppress">
       <directory name="app" />