diff --git a/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.kt b/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.kt
index 646c0f51f..ebd8d538e 100644
--- a/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.kt
+++ b/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.kt
@@ -665,12 +665,16 @@ class SmtpTransport(
         }
     }
 
+    @Suppress("TooGenericExceptionCaught")
     @Throws(MessagingException::class)
     fun checkSettings() {
         ensureClosed()
 
         try {
             open()
+        } catch (e: Exception) {
+            Timber.e(e, "Error while checking server settings")
+            throw e
         } finally {
             close()
         }