diff --git a/modules/smtp/functions.php b/modules/smtp/functions.php
index d609c2ba4..a8a337388 100644
--- a/modules/smtp/functions.php
+++ b/modules/smtp/functions.php
@@ -86,7 +86,7 @@ function send_scheduled_message($handler, $imapMailbox, $folder, $msg_id, $send_
                 $profile = $profiles[0];
             }
             $smtpMailbox = Hm_SMTP_List::connect($profile['smtp_id'], false);
-            if (! $smtpMailbox->authed()) {
+            if (! $smtpMailbox || ! $smtpMailbox->authed()) {
                 Hm_Msgs::add("ERRFailed to authenticate to the SMTP server");
                 return;
             }
diff --git a/modules/smtp/modules.php b/modules/smtp/modules.php
index 816100e0d..545c7a025 100644
--- a/modules/smtp/modules.php
+++ b/modules/smtp/modules.php
@@ -1576,7 +1576,7 @@ public function process() {
 
         foreach ($servers as $server_id => $config) {
             $mailbox = new Hm_Mailbox($server_id, $this->user_config, $this->session, $config);
-            if ($mailbox->connect()) {
+            if ($mailbox || $mailbox->connect()) {
                 $folder = 'Scheduled';
                 $ret = $mailbox->get_messages($folder, 'DATE', false, 'ALL');
                 foreach ($ret[1] as $msg) {