diff --git a/Messaging/Mail/MailSender.vb b/Messaging/Mail/MailSender.vb
index 230438bf..ae0ca4ee 100644
--- a/Messaging/Mail/MailSender.vb
+++ b/Messaging/Mail/MailSender.vb
@@ -9,7 +9,11 @@ Namespace Mail
 
         Public ReadOnly Property Connected2Server As Boolean
             Get
-                Return MailSession.Session.Connected
+                If MailSession IsNot Nothing AndAlso MailSession.Session IsNot Nothing Then
+                    Return MailSession.Session.Connected
+                Else
+                    Return False
+                End If
             End Get
         End Property