1 files changed, 8 insertions, 3 deletions
diff --git a/src/core/imap/MCIMAPSession.cpp b/src/core/imap/MCIMAPSession.cpp
index 4cfcfa95..4d23da60 100644
--- a/src/core/imap/MCIMAPSession.cpp
+++ b/src/core/imap/MCIMAPSession.cpp
@@ -644,11 +644,16 @@ void IMAPSession::connect(ErrorCode * pError)
     int r;
     
     setup();
-    
+
     MCLog("connect %s", MCUTF8DESC(this));
-    
+
     MCAssert(mState == STATE_DISCONNECTED);
-    
+
+    if (mHostname == NULL) {
+        * pError = ErrorConnection;
+        goto close;
+    }
+
     switch (mConnectionType) {
         case ConnectionTypeStartTLS:
         MCLog("STARTTLS connect");