diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
index e804fa2e1..6a234d5fc 100644
--- a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
@@ -416,6 +416,8 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
                         activity.runOnUiThread(new Runnable() {
                             @Override
                             public void run() {
+                                if (task == null)
+                                    return;
                                 task = PluginServices.getTaskService().fetchById(task.getId(), Task.NOTES, Task.ID, Task.UUID, Task.TITLE, Task.HISTORY_FETCH_DATE, Task.USER_ACTIVITIES_PUSHED_AT, Task.ATTACHMENTS_PUSHED_AT);
                                 if (task == null)
                                     return;