diff --git a/app/Ninja/Mailers/Mailer.php b/app/Ninja/Mailers/Mailer.php
index e727b2a9cef4..71263682a765 100644
--- a/app/Ninja/Mailers/Mailer.php
+++ b/app/Ninja/Mailers/Mailer.php
@@ -39,7 +39,7 @@ class Mailer
             
             return true;
         } catch (Exception $exception) {
-            if (method_exists($exception, 'getResponse')) {
+            if (isset($_ENV['POSTMARK_API_TOKEN'])) {
                 $response = $exception->getResponse()->getBody()->getContents();
                 $response = json_decode($response);
                 return nl2br($response->Message);
diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php
index cde24e302dfd..df73c6f6a1e6 100644
--- a/app/Ninja/Repositories/InvoiceRepository.php
+++ b/app/Ninja/Repositories/InvoiceRepository.php
@@ -410,17 +410,16 @@ class InvoiceRepository
             } else if ($item['product_key'] && !$invoice->has_tasks) {
                 $product = Product::findProductByKey(trim($item['product_key']));
 
-                if (!$product) {
-                    $product = Product::createNew();
-                    $product->product_key = trim($item['product_key']);
-                }
-
                 if (\Auth::user()->account->update_products) {
+                    if (!$product) {
+                        $product = Product::createNew();
+                        $product->product_key = trim($item['product_key']);
+                    }
+
                     $product->notes = $item['notes'];
                     $product->cost = $item['cost'];
+                    $product->save();
                 }
-
-                $product->save();
             }
 
             $invoiceItem = InvoiceItem::createNew();