diff --git a/src/org/thialfihar/android/apg/Service.java b/src/org/thialfihar/android/apg/Service.java
index 2c8fd8496..4457274ff 100644
--- a/src/org/thialfihar/android/apg/Service.java
+++ b/src/org/thialfihar/android/apg/Service.java
@@ -54,7 +54,9 @@ public class Service extends android.app.Service {
     public void onStart(Intent intent, int startId) {
         super.onStart(intent, startId);
 
-        mPassPhraseCacheTtl = intent.getIntExtra(EXTRA_TTL, 15);
+        if (intent != null) {
+            mPassPhraseCacheTtl = intent.getIntExtra(EXTRA_TTL, 15);
+        }
         if (mPassPhraseCacheTtl < 15) {
             mPassPhraseCacheTtl = 15;
         }