From 51d6a98d18e8a6039b7e43f903601d8fae5d7212 Mon Sep 17 00:00:00 2001
From: Anmol-Chauhan <anmol.chauhan207@webkul.com>
Date: Mon, 4 Apr 2022 20:01:56 +0530
Subject: [PATCH] issue #6205

---
 packages/Webkul/Admin/src/Traits/Mails.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Admin/src/Traits/Mails.php b/packages/Webkul/Admin/src/Traits/Mails.php
index 356575d84..8c1b61a0c 100644
--- a/packages/Webkul/Admin/src/Traits/Mails.php
+++ b/packages/Webkul/Admin/src/Traits/Mails.php
@@ -135,7 +135,7 @@ trait Mails
     public function sendNewShipmentMail($shipment)
     {
         $customerLocale = $this->getLocale($shipment);
-
+        
         try {
             if ($shipment->email_sent) {
                 return;
@@ -248,7 +248,15 @@ trait Mails
 
         app()->setLocale($locale);
 
-        Mail::queue($notification);
+        try {
+            Mail::queue($notification);
+        } catch(\Exception $e) {
+            app()->setLocale($previousLocale);
+            
+            \Log::error(
+                'prepareMail' . $e->getMessage()
+            );
+        }
 
         app()->setLocale($previousLocale);
     }