diff --git a/src/com/android/launcher3/MemoryTracker.java b/src/com/android/launcher3/MemoryTracker.java
index 600344e..c1057a8 100644
--- a/src/com/android/launcher3/MemoryTracker.java
+++ b/src/com/android/launcher3/MemoryTracker.java
@@ -130,11 +130,12 @@
     public int onStartCommand(Intent intent, int flags, int startId) {
         Log.i(TAG, "Received start id " + startId + ": " + intent);
 
-        if (ACTION_START_TRACKING.equals(intent.getAction())) {
-            final Uri uri = intent.getData();
-            final int pid = intent.getIntExtra("pid", -1);
-            final String name = intent.getStringExtra("name");
-            startTrackingProcess(pid, name);
+        if (intent != null) {
+            if (ACTION_START_TRACKING.equals(intent.getAction())) {
+                final int pid = intent.getIntExtra("pid", -1);
+                final String name = intent.getStringExtra("name");
+                startTrackingProcess(pid, name);
+            }
         }
 
         mHandler.sendEmptyMessage(MSG_START);
