diff --git a/src/com/android/email/NotificationController.java b/src/com/android/email/NotificationController.java
index d4a6e9be0..be3e876be 100644
--- a/src/com/android/email/NotificationController.java
+++ b/src/com/android/email/NotificationController.java
@@ -583,13 +583,16 @@ public class NotificationController {
 
                     if (folderCursor == null) {
                         LogUtils.e(LOG_TAG, "Null folder cursor for mMailboxId %d", mailboxId);
-                        return;
+                        continue;
                     }
 
                     Folder folder = null;
                     try {
                         if (folderCursor.moveToFirst()) {
                             folder = new Folder(folderCursor);
+                        } else {
+                            LogUtils.e(LOG_TAG, "Empty folder cursor for mMailboxId %d", mailboxId);
+                            continue;
                         }
                     } finally {
                         folderCursor.close();