diff --git a/src/com/android/launcher3/logging/UserEventDispatcher.java b/src/com/android/launcher3/logging/UserEventDispatcher.java
index c06dc19..e9a897e 100644
--- a/src/com/android/launcher3/logging/UserEventDispatcher.java
+++ b/src/com/android/launcher3/logging/UserEventDispatcher.java
@@ -106,8 +106,10 @@
         if (cn != null) {
             event.srcTarget[idx].packageNameHash = cn.getPackageName().hashCode();
             event.srcTarget[idx].componentHash = cn.hashCode();
-            event.srcTarget[idx].predictedRank = mPredictedApps.indexOf(
-                    new ComponentKey(cn, itemInfo.user));
+            if (mPredictedApps != null) {
+                event.srcTarget[idx].predictedRank = mPredictedApps.indexOf(
+                        new ComponentKey(cn, itemInfo.user));
+            }
         }
 
         // Fill in the duration of time spent navigating in Launcher and the container.
