diff --git a/src/drv_imap.c b/src/drv_imap.c
index 13e4f37..2b2e26c 100644
--- a/src/drv_imap.c
+++ b/src/drv_imap.c
@@ -1781,8 +1781,10 @@ imap_open_store_namespace2( imap_store_t *ctx )
 			ctx->prefix = nsp_1st_ns->val;
 		if (!ctx->delimiter)
 			ctx->delimiter = nfstrdup( nsp_1st_dl->val );
+		imap_open_store_finalize( ctx );
+	} else {
+		imap_open_store_bail( ctx );
 	}
-	imap_open_store_finalize( ctx );
 }
 
 static void