diff --git a/android/src/org/rockbox/RockboxService.java b/android/src/org/rockbox/RockboxService.java
index e788251508..4aa7bc1916 100644
--- a/android/src/org/rockbox/RockboxService.java
+++ b/android/src/org/rockbox/RockboxService.java
@@ -110,7 +110,7 @@ public class RockboxService extends Service
     {
         LOG("Start Service");
 
-        if (intent.hasExtra("callback"))
+        if (intent != null && intent.hasExtra("callback"))
             resultReceiver = (ResultReceiver) intent.getParcelableExtra("callback");
         if (!rbLibLoaded)
             startservice();