diff --git a/src/com/android/launcher3/compat/LauncherActivityInfoCompatV16.java b/src/com/android/launcher3/compat/LauncherActivityInfoCompatV16.java
index fee0376..15c5e69 100644
--- a/src/com/android/launcher3/compat/LauncherActivityInfoCompatV16.java
+++ b/src/com/android/launcher3/compat/LauncherActivityInfoCompatV16.java
@@ -26,6 +26,7 @@
 import android.content.pm.ResolveInfo;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
+import android.util.Log;
 
 
 public class LauncherActivityInfoCompatV16 extends LauncherActivityInfoCompat {
@@ -51,7 +52,12 @@
     }
 
     public CharSequence getLabel() {
-        return mResolveInfo.loadLabel(mPm);
+        try {
+            return mResolveInfo.loadLabel(mPm);
+        } catch (SecurityException e) {
+            Log.e("LAInfoCompat", "Failed to extract app display name from resolve info", e);
+            return "";
+        }
     }
 
     public Drawable getIcon(int density) {
diff --git a/src/com/android/launcher3/model/WidgetsAndShortcutNameComparator.java b/src/com/android/launcher3/model/WidgetsAndShortcutNameComparator.java
index b990560..2e4167e 100644
--- a/src/com/android/launcher3/model/WidgetsAndShortcutNameComparator.java
+++ b/src/com/android/launcher3/model/WidgetsAndShortcutNameComparator.java
@@ -4,6 +4,8 @@
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.util.Log;
+
 import com.android.launcher3.LauncherAppWidgetProviderInfo;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.compat.AppWidgetManagerCompat;
@@ -91,7 +93,13 @@
             return Utilities.trim(mManager.loadLabel(widgetInfo));
         } else {
             ResolveInfo shortcutInfo = (ResolveInfo) o;
-            return Utilities.trim(shortcutInfo.loadLabel(mPackageManager));
+            try {
+                return Utilities.trim(shortcutInfo.loadLabel(mPackageManager));
+            } catch (Exception e) {
+                Log.e("ShortcutNameComparator",
+                        "Failed to extract app display name from resolve info", e);
+                return "";
+            }
         }
     }
 };
