diff --git a/cachewordlib/src/info/guardianproject/cacheword/CacheWordService.java b/cachewordlib/src/info/guardianproject/cacheword/CacheWordService.java
index a84f756..cddea02 100644
--- a/cachewordlib/src/info/guardianproject/cacheword/CacheWordService.java
+++ b/cachewordlib/src/info/guardianproject/cacheword/CacheWordService.java
@@ -187,7 +187,9 @@ private void resetTimeout() {
             Log.d(TAG, "disabled timeout alarm");
             if (mTimeoutIntent != null) {
                 AlarmManager alarmManager = (AlarmManager) getSystemService(ALARM_SERVICE);
-                alarmManager.cancel(mTimeoutIntent);
+                if(mTimeoutIntent != null){
+                    alarmManager.cancel(mTimeoutIntent);
+                }
             }
         }
     }