1 files changed, 6 insertions, 1 deletions
diff --git a/src/core/imap/MCIMAPNamespace.cc b/src/core/imap/MCIMAPNamespace.cc
index f087d87d..1cfa5a3a 100644
--- a/src/core/imap/MCIMAPNamespace.cc
+++ b/src/core/imap/MCIMAPNamespace.cc
@@ -93,12 +93,17 @@ String * IMAPNamespace::pathForComponents(Array * components)
 
 String * IMAPNamespace::pathForComponentsAndPrefix(Array * components, String * prefix)
 {
-    return itemForPath(prefix)->pathForComponents(components);
+    IMAPNamespaceItem * item = itemForPath(prefix);
+    if (item == NULL)
+        return NULL;
+    return item->pathForComponents(components);
 }
 
 Array * IMAPNamespace::componentsFromPath(String * path)
 {
     IMAPNamespaceItem * item = itemForPath(path);
+    if (item == NULL)
+        return NULL;
     return item->componentsForPath(path);
 }