diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDialog.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDialog.java
index 3ad0b0107..775a8431b 100644
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDialog.java
+++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDialog.java
@@ -153,6 +153,8 @@ public class ReminderDialog extends Dialog {
     }
 
     private void addFacesToReminder(Activity activity, Task task) {
+        if (task == null)
+            return;
         LinkedHashSet<String> pictureUrls = new LinkedHashSet<String>();
         AtomicBoolean isSharedTask = new AtomicBoolean(false);
 
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
index a339fef99..c35d9a76b 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -1408,7 +1408,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
     // EditNoteActivity Listener when there are new updates/comments
     @Override
     public void updatesChanged()  {
-        if (mPager.getCurrentItem() == TAB_VIEW_UPDATES)
+        if (mPager != null && mPager.getCurrentItem() == TAB_VIEW_UPDATES)
             setPagerHeightForPosition(TAB_VIEW_UPDATES);
     }
 
diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
index 7ebe9754d..fdecffc53 100644
--- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
@@ -458,8 +458,10 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
             if (taskActionLoader.containsKey(task.getId())) {
                 taskAction.setVisibility(View.VISIBLE);
                 TaskAction action = taskActionLoader.get(task.getId());
-                taskAction.setImageBitmap(action.icon);
-                taskAction.setTag(action);
+                if (action != null) {
+                    taskAction.setImageBitmap(action.icon);
+                    taskAction.setTag(action);
+                }
             } else {
                 taskAction.setVisibility(View.GONE);
                 taskAction.setTag(null);