diff --git a/astrid/plugin-src/com/todoroo/astrid/timers/TimerPlugin.java b/astrid/plugin-src/com/todoroo/astrid/timers/TimerPlugin.java
index c5ded360b..7d1185e30 100644
--- a/astrid/plugin-src/com/todoroo/astrid/timers/TimerPlugin.java
+++ b/astrid/plugin-src/com/todoroo/astrid/timers/TimerPlugin.java
@@ -54,6 +54,8 @@ public class TimerPlugin extends BroadcastReceiver {
         // this is needed just for stopping a task
         if (!task.containsNonNullValue(Task.TIMER_START))
             task = PluginServices.getTaskService().fetchById(task.getId(), Task.ID, Task.TIMER_START, Task.ELAPSED_SECONDS);
+        if (task == null)
+            return;
 
         if(start) {
             if(task.getValue(Task.TIMER_START) == 0) {