diff --git a/smtp.module b/smtp.module
index 2e69241..3fd16c4 100644
--- a/smtp.module
+++ b/smtp.module
@@ -85,7 +85,10 @@ function _smtp_mailer_send($variables) {
   $logger->info('Sending mail to: @to', array('@to' => $to));
 
   // Try to send e-mail. If it fails, set watchdog entry.
-  if (!$mailer->Send()) {
+  try {
+    $mailer->Send();
+  }
+  catch (Exception $e) {
     $logger->error('Error sending e-mail from @from to @to: @error_message', array('@from' => $from, '@to' => $to, '@error_message' => $mailer->ErrorInfo));
     return FALSE;
   }
diff --git a/src/Plugin/Mail/SMTPMailSystem.php b/src/Plugin/Mail/SMTPMailSystem.php
index bd3b335..6012cf1 100644
--- a/src/Plugin/Mail/SMTPMailSystem.php
+++ b/src/Plugin/Mail/SMTPMailSystem.php
@@ -103,7 +103,7 @@ class SMTPMailSystem implements MailInterface, ContainerFactoryPluginInterface {
     $subject = $message['subject'];
 
     // Create a new PHPMailer object - autoloaded from registry.
-    $mailer = new PHPMailer();
+    $mailer = new PHPMailer(TRUE);
 
     // Turn on debugging, if requested.
     if ($this->smtpConfig->get('smtp_debugging') == 1) {