diff --git a/app/src/main/java/org/traccar/client/TrackingService.kt b/app/src/main/java/org/traccar/client/TrackingService.kt
index 9fbd3aa..86c91e9 100644
--- a/app/src/main/java/org/traccar/client/TrackingService.kt
+++ b/app/src/main/java/org/traccar/client/TrackingService.kt
@@ -49,7 +49,7 @@ class TrackingService : Service() {
             stopForeground(true)
         }
 
-        override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+        override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
             stopSelfResult(startId)
             return START_NOT_STICKY
         }
@@ -83,7 +83,7 @@ class TrackingService : Service() {
     }
 
     @TargetApi(Build.VERSION_CODES.ECLAIR)
-    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         WakefulBroadcastReceiver.completeWakefulIntent(intent)
         return START_STICKY
     }
diff --git a/app/src/main/java/org/traccar/client/WakefulBroadcastReceiver.kt b/app/src/main/java/org/traccar/client/WakefulBroadcastReceiver.kt
index 5f70143..8a8a5df 100644
--- a/app/src/main/java/org/traccar/client/WakefulBroadcastReceiver.kt
+++ b/app/src/main/java/org/traccar/client/WakefulBroadcastReceiver.kt
@@ -51,8 +51,8 @@ abstract class WakefulBroadcastReceiver : BroadcastReceiver() {
             }
         }
 
-        fun completeWakefulIntent(intent: Intent): Boolean {
-            val id = intent.getIntExtra(EXTRA_WAKE_LOCK_ID, 0)
+        fun completeWakefulIntent(intent: Intent?): Boolean {
+            val id = intent?.getIntExtra(EXTRA_WAKE_LOCK_ID, 0) ?: 0
             if (id == 0) {
                 return false
             }