1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/UninstallShortcutReceiver.java b/src/com/android/launcher3/UninstallShortcutReceiver.java
index ccea4ec0c..c9d0bb5f5 100644
--- a/src/com/android/launcher3/UninstallShortcutReceiver.java
+++ b/src/com/android/launcher3/UninstallShortcutReceiver.java
@@ -104,7 +104,9 @@ public class UninstallShortcutReceiver extends BroadcastReceiver {
             try {
                 while (c.moveToNext()) {
                     try {
-                        if (intent.filterEquals(Intent.parseUri(c.getString(intentIndex), 0))) {
+                        String intentStr = c.getString(intentIndex);
+                        if (intentStr != null
+                                && intent.filterEquals(Intent.parseUri(intentStr, 0))) {
                             final long id = c.getLong(idIndex);
                             final Uri uri = LauncherSettings.Favorites.getContentUri(id, false);
                             cr.delete(uri, null, null);