diff --git a/class.phpmailer.php b/class.phpmailer.php
index 31a290f57..1b4147467 100644
--- a/class.phpmailer.php
+++ b/class.phpmailer.php
@@ -1221,7 +1221,6 @@ public function getSMTPInstance()
     protected function smtpSend($header, $body)
     {
         $bad_rcpt = array();
-
         if (!$this->smtpConnect()) {
             throw new phpmailerException($this->lang('smtp_connect_failed'), self::STOP_CRITICAL);
         }
@@ -1323,13 +1322,23 @@ public function smtpConnect($options = array())
             // The host string prefix can temporarily override the current setting for SMTPSecure
             // If it's not specified, the default value is used
             $prefix = '';
+            $secure = $this->SMTPSecure;
             $tls = ($this->SMTPSecure == 'tls');
-            if ($hostinfo[2] == 'ssl' or ($hostinfo[2] == '' and $this->SMTPSecure == 'ssl')) {
+            if ('ssl' == $hostinfo[2] or ('' == $hostinfo[2] and 'ssl' == $this->SMTPSecure)) {
                 $prefix = 'ssl://';
-                $tls = false; // Can't have SSL and TLS at once
+                $tls = false; // Can't have SSL and TLS at the same time
+                $secure = 'ssl';
             } elseif ($hostinfo[2] == 'tls') {
                 $tls = true;
                 // tls doesn't use a prefix
+                $secure = 'tls';
+            }
+            //Do we need the OpenSSL extension?
+            if ('tls' === $secure or 'ssl' === $secure) {
+                //Check for an OpenSSL constant rather than using extension_loaded, which is sometimes disabled
+                if (!defined('OPENSSL_ALGO_SHA1')) {
+                    throw new phpmailerException($this->lang('extension_missing').'openssl', self::STOP_CRITICAL);
+                }
             }
             $host = $hostinfo[3];
             $port = $this->Port;
@@ -1426,7 +1435,8 @@ public function setLanguage($langcode = 'en', $lang_path = '')
             'signing' => 'Signing Error: ',
             'smtp_connect_failed' => 'SMTP connect() failed.',
             'smtp_error' => 'SMTP server error: ',
-            'variable_set' => 'Cannot set or reset variable: '
+            'variable_set' => 'Cannot set or reset variable: ',
+            'extension_missing' => 'Extension missing: '
         );
         if (empty($lang_path)) {
             // Calculate an absolute path so it can work if CWD is not here
@@ -1434,13 +1444,14 @@ public function setLanguage($langcode = 'en', $lang_path = '')
         }
         $foundlang = true;
         $lang_file = $lang_path . 'phpmailer.lang-' . $langcode . '.php';
-        if ($langcode != 'en') { // There is no English translation file
+        // There is no English translation file
+        if ($langcode != 'en') {
             // Make sure language file path is readable
             if (!is_readable($lang_file)) {
                 $foundlang = false;
             } else {
                 // Overwrite language-specific strings.
-                // This way we'll never have missing translations.
+                // This way we'll never have missing translation keys.
                 $foundlang = include $lang_file;
             }
         }
@@ -1964,7 +1975,7 @@ public function createBody()
         } elseif ($this->sign_key_file) {
             try {
                 if (!defined('PKCS7_TEXT')) {
-                    throw new phpmailerException($this->lang('signing') . ' OpenSSL extension missing.');
+                    throw new phpmailerException($this->lang('extension_missing') . 'openssl');
                 }
                 // @TODO would be nice to use php://temp streams here, but need to wrap for PHP < 5.1
                 $file = tempnam(sys_get_temp_dir(), 'mail');
@@ -2879,10 +2890,11 @@ protected function lang($key)
             $this->setLanguage('en'); // set the default language
         }
 
-        if (isset($this->language[$key])) {
+        if (array_key_exists($key, $this->language)) {
             return $this->language[$key];
         } else {
-            return 'Language string failed to load: ' . $key;
+            //Return the key as a fallback
+            return $key;
         }
     }
 
@@ -3309,7 +3321,7 @@ public function DKIM_Sign($signHeader)
     {
         if (!defined('PKCS7_TEXT')) {
             if ($this->exceptions) {
-                throw new phpmailerException($this->lang('signing') . ' OpenSSL extension missing.');
+                throw new phpmailerException($this->lang('extension_missing') . 'openssl');
             }
             return '';
         }
diff --git a/language/phpmailer.lang-am.php b/language/phpmailer.lang-am.php
index 05c73544c..e1b834d12 100755
--- a/language/phpmailer.lang-am.php
+++ b/language/phpmailer.lang-am.php
@@ -23,3 +23,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP -ի connect() ֆունկցիան չի հաջողվել';
 $PHPMAILER_LANG['smtp_error']           = 'SMTP սերվերի սխալ: ';
 $PHPMAILER_LANG['variable_set']         = 'Չի հաջողվում ստեղծել կամ վերափոխել փոփոխականը: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-ar.php b/language/phpmailer.lang-ar.php
index 19e9e8f31..b8c02c7e4 100644
--- a/language/phpmailer.lang-ar.php
+++ b/language/phpmailer.lang-ar.php
@@ -24,3 +24,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() غير ممكن.';
 $PHPMAILER_LANG['smtp_error']           = 'خطأ على مستوى الخادم SMTP: ';
 $PHPMAILER_LANG['variable_set']         = 'لا يمكن تعيين أو إعادة تعيين متغير: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-az.php b/language/phpmailer.lang-az.php
index 3f9cd2e8e..3749d83d6 100644
--- a/language/phpmailer.lang-az.php
+++ b/language/phpmailer.lang-az.php
@@ -23,3 +23,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP serverinə qoşulma uğursuz oldu.';
 $PHPMAILER_LANG['smtp_error']           = 'SMTP serveri xətası: ';
 $PHPMAILER_LANG['variable_set']         = 'Dəyişənin quraşdırılması uğursuz oldu: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-be.php b/language/phpmailer.lang-be.php
index 9801368d6..e2f98f0f6 100644
--- a/language/phpmailer.lang-be.php
+++ b/language/phpmailer.lang-be.php
@@ -23,3 +23,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'Памылка сувязі з SMTP-серверам.';
 $PHPMAILER_LANG['smtp_error']           = 'Памылка SMTP: ';
 $PHPMAILER_LANG['variable_set']         = 'Нельга ўстанавіць або перамяніць значэнне пераменнай: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-bg.php b/language/phpmailer.lang-bg.php
index 76fce706a..7f83abca8 100644
--- a/language/phpmailer.lang-bg.php
+++ b/language/phpmailer.lang-bg.php
@@ -23,3 +23,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP провален connect().';
 $PHPMAILER_LANG['smtp_error']           = 'SMTP сървърна грешка: ';
 $PHPMAILER_LANG['variable_set']         = 'Не може да се установи или възстанови променлива: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-br.php b/language/phpmailer.lang-br.php
index d157ccd63..c407fe956 100644
--- a/language/phpmailer.lang-br.php
+++ b/language/phpmailer.lang-br.php
@@ -24,3 +24,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() falhou.';
 $PHPMAILER_LANG['smtp_error']           = 'Erro de servidor SMTP: ';
 $PHPMAILER_LANG['variable_set']         = 'Não foi possível definir ou resetar a variável: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-ca.php b/language/phpmailer.lang-ca.php
index c5964ce54..5620d395f 100644
--- a/language/phpmailer.lang-ca.php
+++ b/language/phpmailer.lang-ca.php
@@ -23,3 +23,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'Ha fallat el SMTP Connect().';
 $PHPMAILER_LANG['smtp_error']           = 'Error del servidor SMTP: ';
 $PHPMAILER_LANG['variable_set']         = 'No s’ha pogut establir o restablir la variable: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-ch.php b/language/phpmailer.lang-ch.php
index 1b5c6d171..1c6ebaf3c 100644
--- a/language/phpmailer.lang-ch.php
+++ b/language/phpmailer.lang-ch.php
@@ -23,3 +23,4 @@
 //$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
 //$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
 //$PHPMAILER_LANG['variable_set']         = 'Cannot set or reset variable: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-cz.php b/language/phpmailer.lang-cz.php
index 89f40f8bf..8cb1a3d80 100644
--- a/language/phpmailer.lang-cz.php
+++ b/language/phpmailer.lang-cz.php
@@ -22,3 +22,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() selhal.';
 $PHPMAILER_LANG['smtp_error']           = 'Chyba SMTP serveru: ';
 $PHPMAILER_LANG['variable_set']         = 'Nelze nastavit nebo změnit proměnnou: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-de.php b/language/phpmailer.lang-de.php
index 174f178ff..233aa75e9 100644
--- a/language/phpmailer.lang-de.php
+++ b/language/phpmailer.lang-de.php
@@ -22,3 +22,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'Verbindung zu SMTP Server fehlgeschlagen.';
 $PHPMAILER_LANG['smtp_error']           = 'Fehler vom SMTP Server: ';
 $PHPMAILER_LANG['variable_set']         = 'Kann Variable nicht setzen oder zurücksetzen: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-dk.php b/language/phpmailer.lang-dk.php
index 16d74afcd..8968c07c5 100644
--- a/language/phpmailer.lang-dk.php
+++ b/language/phpmailer.lang-dk.php
@@ -23,3 +23,4 @@
 //$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
 //$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
 //$PHPMAILER_LANG['variable_set']         = 'Cannot set or reset variable: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-el.php b/language/phpmailer.lang-el.php
index a85e10caf..0f108c09c 100644
--- a/language/phpmailer.lang-el.php
+++ b/language/phpmailer.lang-el.php
@@ -22,3 +22,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'Αποτυχία σύνδεσης στον SMTP Server.';
 $PHPMAILER_LANG['smtp_error']           = 'Σφάλμα από τον SMTP Server: ';
 $PHPMAILER_LANG['variable_set']         = 'Αδυναμία ορισμού ή αρχικοποίησης μεταβλητής: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-eo.php b/language/phpmailer.lang-eo.php
index 786e945d7..2cf7d5c79 100644
--- a/language/phpmailer.lang-eo.php
+++ b/language/phpmailer.lang-eo.php
@@ -22,3 +22,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP konektado malsukcesis.';
 $PHPMAILER_LANG['smtp_error']           = 'Eraro de servilo SMTP : ';
 $PHPMAILER_LANG['variable_set']         = 'Variablo ne pravalorizeblas aŭ ne repravalorizeblas: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-es.php b/language/phpmailer.lang-es.php
index c33a6ad7b..5ef716e8f 100644
--- a/language/phpmailer.lang-es.php
+++ b/language/phpmailer.lang-es.php
@@ -23,3 +23,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() falló.';
 $PHPMAILER_LANG['smtp_error']           = 'Error del servidor SMTP: ';
 $PHPMAILER_LANG['variable_set']         = 'No se pudo configurar la variable: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-et.php b/language/phpmailer.lang-et.php
index 4bb518629..93b601103 100644
--- a/language/phpmailer.lang-et.php
+++ b/language/phpmailer.lang-et.php
@@ -24,3 +24,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() ebaõnnestus.';
 $PHPMAILER_LANG['smtp_error']           = 'SMTP serveri viga: ';
 $PHPMAILER_LANG['variable_set']         = 'Ei õnnestunud määrata või lähtestada muutujat: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-fa.php b/language/phpmailer.lang-fa.php
index af2b6961a..ad0745c58 100644
--- a/language/phpmailer.lang-fa.php
+++ b/language/phpmailer.lang-fa.php
@@ -24,3 +24,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'خطا در اتصال به SMTP.';
 $PHPMAILER_LANG['smtp_error']           = 'خطا در SMTP Server: ';
 $PHPMAILER_LANG['variable_set']         = 'امکان ارسال یا ارسال مجدد متغیر‌ها وجود ندارد: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-fi.php b/language/phpmailer.lang-fi.php
index d09241ff4..739c23506 100644
--- a/language/phpmailer.lang-fi.php
+++ b/language/phpmailer.lang-fi.php
@@ -24,3 +24,4 @@
 //$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
 //$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
 //$PHPMAILER_LANG['variable_set']         = 'Cannot set or reset variable: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-fo.php b/language/phpmailer.lang-fo.php
index 6240b4070..724f3ed3a 100644
--- a/language/phpmailer.lang-fo.php
+++ b/language/phpmailer.lang-fo.php
@@ -23,3 +23,4 @@
 //$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
 //$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
 //$PHPMAILER_LANG['variable_set']         = 'Cannot set or reset variable: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-fr.php b/language/phpmailer.lang-fr.php
index 604b44c96..78a66ae15 100644
--- a/language/phpmailer.lang-fr.php
+++ b/language/phpmailer.lang-fr.php
@@ -26,3 +26,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'Échec de la connexion SMTP.';
 $PHPMAILER_LANG['smtp_error']           = 'Erreur du serveur SMTP : ';
 $PHPMAILER_LANG['variable_set']         = 'Impossible d\'initialiser ou de réinitialiser une variable : ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-gl.php b/language/phpmailer.lang-gl.php
index 9675a707c..5bd8b44a4 100644
--- a/language/phpmailer.lang-gl.php
+++ b/language/phpmailer.lang-gl.php
@@ -23,3 +23,5 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() fallou.';
 $PHPMAILER_LANG['smtp_error']           = 'Erro do servidor SMTP: ';
 $PHPMAILER_LANG['variable_set']         = 'Non puidemos axustar ou reaxustar a variábel: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-hr.php b/language/phpmailer.lang-hr.php
index ad00ed944..55ed6a001 100644
--- a/language/phpmailer.lang-hr.php
+++ b/language/phpmailer.lang-hr.php
@@ -23,3 +23,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'Spajanje na SMTP poslužitelj nije uspjelo.';
 $PHPMAILER_LANG['smtp_error']           = 'Greška SMTP poslužitelja: ';
 $PHPMAILER_LANG['variable_set']         = 'Ne mogu postaviti varijablu niti ju vratiti nazad: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-hu.php b/language/phpmailer.lang-hu.php
index 8139c08c0..d7ca88870 100644
--- a/language/phpmailer.lang-hu.php
+++ b/language/phpmailer.lang-hu.php
@@ -23,3 +23,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'Hiba az SMTP-kapcsolatban.';
 $PHPMAILER_LANG['smtp_error']           = 'SMTP-szerver hiba: ';
 $PHPMAILER_LANG['variable_set']         = 'A következő változók beállítása nem sikerült: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-id.php b/language/phpmailer.lang-id.php
index a1066596e..e57b5240b 100644
--- a/language/phpmailer.lang-id.php
+++ b/language/phpmailer.lang-id.php
@@ -23,3 +23,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() gagal.';
 $PHPMAILER_LANG['smtp_error']           = 'Kesalahan peladen SMTP : ';
 $PHPMAILER_LANG['variable_set']         = 'Tidak berhasil mengatur atau mengatur ulang variable : ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-it.php b/language/phpmailer.lang-it.php
index 40f0b1bcf..d2f4643e7 100644
--- a/language/phpmailer.lang-it.php
+++ b/language/phpmailer.lang-it.php
@@ -24,3 +24,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() fallita.';
 $PHPMAILER_LANG['smtp_error']           = 'Errore del server SMTP: ';
 $PHPMAILER_LANG['variable_set']         = 'Impossibile impostare o resettare la variabile: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-ja.php b/language/phpmailer.lang-ja.php
index a7aa193e6..29f8662cb 100644
--- a/language/phpmailer.lang-ja.php
+++ b/language/phpmailer.lang-ja.php
@@ -24,3 +24,4 @@
 //$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
 //$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
 //$PHPMAILER_LANG['variable_set']         = 'Cannot set or reset variable: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-ka.php b/language/phpmailer.lang-ka.php
index 6dec7cebc..cdf316878 100644
--- a/language/phpmailer.lang-ka.php
+++ b/language/phpmailer.lang-ka.php
@@ -23,3 +23,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'შეცდომა SMTP სერვერთან დაკავშირებისას';
 $PHPMAILER_LANG['smtp_error']           = 'SMTP სერვერის შეცდომა: ';
 $PHPMAILER_LANG['variable_set']         = 'შეუძლებელია შემდეგი ცვლადის შექმნა ან შეცვლა: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-lt.php b/language/phpmailer.lang-lt.php
index 4ff70cf4d..27267730b 100644
--- a/language/phpmailer.lang-lt.php
+++ b/language/phpmailer.lang-lt.php
@@ -23,3 +23,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP susijungimo klaida';
 $PHPMAILER_LANG['smtp_error']           = 'SMTP stoties klaida: ';
 $PHPMAILER_LANG['variable_set']         = 'Nepavyko priskirti reikšmės kintamajam: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-lv.php b/language/phpmailer.lang-lv.php
index 8eabb5030..b2ab55f61 100644
--- a/language/phpmailer.lang-lv.php
+++ b/language/phpmailer.lang-lv.php
@@ -23,3 +23,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP savienojuma kļūda';
 $PHPMAILER_LANG['smtp_error']           = 'SMTP servera kļūda: ';
 $PHPMAILER_LANG['variable_set']         = 'Nevar piešķirt mainīgā vērtību: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-ms.php b/language/phpmailer.lang-ms.php
index e9f287213..11d3daa41 100644
--- a/language/phpmailer.lang-ms.php
+++ b/language/phpmailer.lang-ms.php
@@ -23,3 +23,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() telah gagal.';
 $PHPMAILER_LANG['smtp_error']           = 'Ralat pada pelayan SMTP: ';
 $PHPMAILER_LANG['variable_set']         = 'Tidak boleh menetapkan atau menetapkan semula pembolehubah: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-nl.php b/language/phpmailer.lang-nl.php
index edd3cd768..54a8f9af0 100644
--- a/language/phpmailer.lang-nl.php
+++ b/language/phpmailer.lang-nl.php
@@ -23,3 +23,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Verbinding mislukt.';
 $PHPMAILER_LANG['smtp_error']           = 'SMTP-serverfout: ';
 $PHPMAILER_LANG['variable_set']         = 'Kan de volgende variabele niet instellen of resetten: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-no.php b/language/phpmailer.lang-no.php
index d02282177..3d37ba4f0 100644
--- a/language/phpmailer.lang-no.php
+++ b/language/phpmailer.lang-no.php
@@ -22,3 +22,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() feilet.';
 $PHPMAILER_LANG['smtp_error']           = 'SMTP-serverfeil: ';
 $PHPMAILER_LANG['variable_set']         = 'Kan ikke sette eller resette variabelen: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-pl.php b/language/phpmailer.lang-pl.php
index 704961a9e..991914faf 100644
--- a/language/phpmailer.lang-pl.php
+++ b/language/phpmailer.lang-pl.php
@@ -23,3 +23,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() zakończone niepowodzeniem.';
 $PHPMAILER_LANG['smtp_error']           = 'Błąd SMTP: ';
 $PHPMAILER_LANG['variable_set']         = 'Nie można ustawić lub zmodyfikować zmiennej: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-pt.php b/language/phpmailer.lang-pt.php
index 2c8c1e715..3916486ec 100644
--- a/language/phpmailer.lang-pt.php
+++ b/language/phpmailer.lang-pt.php
@@ -23,3 +23,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() falhou.';
 $PHPMAILER_LANG['smtp_error']           = 'Erro de servidor SMTP: ';
 $PHPMAILER_LANG['variable_set']         = 'Não foi possível definir ou redefinir a variável: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-ro.php b/language/phpmailer.lang-ro.php
index 82fbe1b39..e8a56fa90 100644
--- a/language/phpmailer.lang-ro.php
+++ b/language/phpmailer.lang-ro.php
@@ -23,3 +23,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'Conectarea la serverul SMTP a esuat.';
 $PHPMAILER_LANG['smtp_error']           = 'A aparut o eroare la serverul SMTP. ';
 $PHPMAILER_LANG['variable_set']         = 'Nu se poate seta/reseta variabila. ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-ru.php b/language/phpmailer.lang-ru.php
index b4e40a8ff..e6e4496cd 100644
--- a/language/phpmailer.lang-ru.php
+++ b/language/phpmailer.lang-ru.php
@@ -23,3 +23,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'Ошибка соединения с SMTP-сервером';
 $PHPMAILER_LANG['smtp_error']           = 'Ошибка SMTP-сервера: ';
 $PHPMAILER_LANG['variable_set']         = 'Невозможно установить или переустановить переменную: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-se.php b/language/phpmailer.lang-se.php
index 299f76f96..c71cb51e7 100644
--- a/language/phpmailer.lang-se.php
+++ b/language/phpmailer.lang-se.php
@@ -23,3 +23,4 @@
 //$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
 //$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
 //$PHPMAILER_LANG['variable_set']         = 'Cannot set or reset variable: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-sk.php b/language/phpmailer.lang-sk.php
index ad8e857ed..a38f4e52c 100644
--- a/language/phpmailer.lang-sk.php
+++ b/language/phpmailer.lang-sk.php
@@ -23,3 +23,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() zlyhalo.';
 $PHPMAILER_LANG['smtp_error']           = 'SMTP chyba serveru: ';
 $PHPMAILER_LANG['variable_set']         = 'Nemožno nastaviť alebo resetovať premennú: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-sl.php b/language/phpmailer.lang-sl.php
index 86308ce8d..14fa2a5cc 100644
--- a/language/phpmailer.lang-sl.php
+++ b/language/phpmailer.lang-sl.php
@@ -23,3 +23,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'Ne morem vzpostaviti povezave s SMTP strežnikom.';
 $PHPMAILER_LANG['smtp_error']           = 'Napaka SMTP strežnika: ';
 $PHPMAILER_LANG['variable_set']         = 'Ne morem nastaviti oz. ponastaviti spremenljivke: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-sr.php b/language/phpmailer.lang-sr.php
index 29258e36b..26360b200 100644
--- a/language/phpmailer.lang-sr.php
+++ b/language/phpmailer.lang-sr.php
@@ -23,3 +23,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'Повезивање са SMTP сервером није успело.';
 $PHPMAILER_LANG['smtp_error']           = 'Грешка SMTP сервера: ';
 $PHPMAILER_LANG['variable_set']         = 'Није могуће задати променљиву, нити је вратити уназад: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-tr.php b/language/phpmailer.lang-tr.php
index c291ea68c..323fb4b5f 100644
--- a/language/phpmailer.lang-tr.php
+++ b/language/phpmailer.lang-tr.php
@@ -26,3 +26,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP connect() fonksiyonu başarısız.';
 $PHPMAILER_LANG['smtp_error']           = 'SMTP sunucu hatası: ';
 $PHPMAILER_LANG['variable_set']         = 'Değişken ayarlanamadı ya da sıfırlanamadı: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-uk.php b/language/phpmailer.lang-uk.php
index c2bb86c2c..64ede4460 100644
--- a/language/phpmailer.lang-uk.php
+++ b/language/phpmailer.lang-uk.php
@@ -23,3 +23,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'Помилка зєднання із SMTP-сервером';
 $PHPMAILER_LANG['smtp_error']           = 'Помилка SMTP-сервера: ';
 $PHPMAILER_LANG['variable_set']         = 'Неможливо встановити або перевстановити змінну: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-vi.php b/language/phpmailer.lang-vi.php
index 66c51175e..8a3ea7192 100644
--- a/language/phpmailer.lang-vi.php
+++ b/language/phpmailer.lang-vi.php
@@ -23,3 +23,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'Lỗi kết nối với SMTP';
 $PHPMAILER_LANG['smtp_error']           = 'Lỗi máy chủ smtp ';
 $PHPMAILER_LANG['variable_set']         = 'Không thể thiết lập hoặc thiết lập lại biến: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-zh.php b/language/phpmailer.lang-zh.php
index a0b0bb9c9..bd523f4f6 100644
--- a/language/phpmailer.lang-zh.php
+++ b/language/phpmailer.lang-zh.php
@@ -24,3 +24,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP連線失敗';
 $PHPMAILER_LANG['smtp_error']           = 'SMTP伺服器錯誤: ';
 $PHPMAILER_LANG['variable_set']         = '無法設定或重設變數: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/language/phpmailer.lang-zh_cn.php b/language/phpmailer.lang-zh_cn.php
index 36770199b..1586dbad0 100644
--- a/language/phpmailer.lang-zh_cn.php
+++ b/language/phpmailer.lang-zh_cn.php
@@ -24,3 +24,4 @@
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP服务器连接失败。';
 $PHPMAILER_LANG['smtp_error']           = 'SMTP服务器出错: ';
 $PHPMAILER_LANG['variable_set']         = '无法设置或重置变量：';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/test/phpmailerTest.php b/test/phpmailerTest.php
index b59a89497..de0319409 100644
--- a/test/phpmailerTest.php
+++ b/test/phpmailerTest.php
@@ -1145,7 +1145,7 @@ public function testDenialOfServiceAttack2()
      */
     public function testError()
     {
-        $this->Mail->Subject .= ': This should be sent';
+        $this->Mail->Subject .= ': Error hendling test - this should be sent ok';
         $this->buildBody();
         $this->Mail->clearAllRecipients(); // no addresses should cause an error
         $this->assertTrue($this->Mail->isError() == false, 'Error found');