diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksFragmentHelper.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksFragmentHelper.java
index 3e0da7ab8..9cc3ce83a 100644
--- a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksFragmentHelper.java
+++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksFragmentHelper.java
@@ -136,6 +136,9 @@ public class SubtasksFragmentHelper {
     private final GrabberClickListener rowClickListener = new GrabberClickListener() {
         @Override
         public void onLongClick(final View v) {
+            if(v == null)
+                return;
+
             fragment.registerForContextMenu(getListView());
             getListView().showContextMenuForChild(v);
             fragment.unregisterForContextMenu(getListView());
@@ -143,6 +146,8 @@ public class SubtasksFragmentHelper {
 
         @Override
         public void onClick(View v) {
+            if(v == null)
+                return;
             ((DraggableTaskAdapter) taskAdapter).getListener().onClick(v);
         }
     };