diff --git a/src/com/android/email/activity/setup/MailboxSettings.java b/src/com/android/email/activity/setup/MailboxSettings.java
index d6b649a36..e3db75930 100644
--- a/src/com/android/email/activity/setup/MailboxSettings.java
+++ b/src/com/android/email/activity/setup/MailboxSettings.java
@@ -374,7 +374,9 @@ public class MailboxSettings extends PreferenceActivity {
             Folder tmp = folder;
             while (tmp != null && tmp.parent != null && !tmp.parent.toString().isEmpty()) {
                 tmp = folders.get(tmp.parent);
-                name = tmp.name + "/" + name;
+                if (tmp != null) {
+                    name = tmp.name + "/" + name;
+                }
             }
             return name;
         }