1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/launcher3/FolderIcon.java b/src/com/android/launcher3/FolderIcon.java
index a166b1819..c9f7556c1 100644
--- a/src/com/android/launcher3/FolderIcon.java
+++ b/src/com/android/launcher3/FolderIcon.java
@@ -173,6 +173,10 @@ public class FolderIcon extends FrameLayout implements FolderListener {
         Folder folder;
         if (folderInfo.isRemote()) {
             folder = launcher.getRemoteFolderManager().createRemoteFolder(icon, launcher.getDragLayer());
+            if (folder == null) {
+                LauncherModel.deleteItemFromDatabase(launcher, folderInfo);
+                return null;
+            }
         } else {
             folder = Folder.fromXml(launcher, launcher.getDragLayer());
         }