diff --git a/OpenChange/MAPIStoreContext.m b/OpenChange/MAPIStoreContext.m
index 1b370c2f3..376a96623 100644
--- a/OpenChange/MAPIStoreContext.m
+++ b/OpenChange/MAPIStoreContext.m
@@ -276,6 +276,11 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
 {
   NSString *username;
 
+  if (newConnInfo == NULL)
+    {
+      return nil;
+    }
+
   if ((self = [self init]))
     {
       ASSIGN (contextUrl, newUrl);