Use Swift_TransportException for Mailgun & SES

Author: gbuckingham89

src/Illuminate/Mail/Transport/MailgunTransport.php

@@ -3,7 +3,9 @@
 namespace Illuminate\Mail\Transport;
 
 use GuzzleHttp\ClientInterface;
+use GuzzleHttp\Exception\GuzzleException;
 use Swift_Mime_SimpleMessage;
+use Swift_TransportException;
 
 class MailgunTransport extends Transport
 {
@@ -68,11 +70,15 @@ public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = nul
 
         $message->setBcc([]);
 
-        $response = $this->client->request(
-            'POST',
-            "https://{$this->endpoint}/v3/{$this->domain}/messages.mime",
-            $this->payload($message, $to)
-        );
+        try {
+            $response = $this->client->request(
+                'POST',
+                "https://{$this->endpoint}/v3/{$this->domain}/messages.mime",
+                $this->payload($message, $to)
+            );
+        } catch (GuzzleException $e) {
+            throw new Swift_TransportException('Failed to make request to Mailgun API', $e->getCode(), $e);
+        }
 
         $messageId = $this->getMessageId($response);
 

src/Illuminate/Mail/Transport/SesTransport.php

@@ -2,8 +2,10 @@
 
 namespace Illuminate\Mail\Transport;
 
+use Aws\Exception\AwsException;
 use Aws\Ses\SesClient;
 use Swift_Mime_SimpleMessage;
+use Swift_TransportException;
 
 class SesTransport extends Transport
 {
@@ -43,16 +45,20 @@ public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = nul
     {
         $this->beforeSendPerformed($message);
 
-        $result = $this->ses->sendRawEmail(
-            array_merge(
-                $this->options, [
-                    'Source' => key($message->getSender() ?: $message->getFrom()),
-                    'RawMessage' => [
-                        'Data' => $message->toString(),
-                    ],
-                ]
-            )
-        );
+        try {
+            $result = $this->ses->sendRawEmail(
+                array_merge(
+                    $this->options, [
+                        'Source' => key($message->getSender() ?: $message->getFrom()),
+                        'RawMessage' => [
+                            'Data' => $message->toString(),
+                        ],
+                    ]
+                )
+            );
+        } catch (AwsException $e) {
+            throw new Swift_TransportException('Failed to make request to AWS SES API', $e->getCode(), $e);
+        }
 
         $messageId = $result->get('MessageId');