diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ConstructOutstandingTableFromMasterTable.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ConstructOutstandingTableFromMasterTable.java
index 1c12085f8..316bf94bc 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ConstructOutstandingTableFromMasterTable.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ConstructOutstandingTableFromMasterTable.java
@@ -50,7 +50,11 @@ public class ConstructOutstandingTableFromMasterTable<TYPE extends RemoteModel,
                     oe.clear();
                     oe.setValue(OutstandingEntry.ENTITY_ID_PROPERTY, itemId);
                     oe.setValue(OutstandingEntry.COLUMN_STRING_PROPERTY, p.name);
-                    oe.setValue(OutstandingEntry.VALUE_STRING_PROPERTY, items.get(p).toString());
+                    Object value = items.get(p);
+                    if (value == null)
+                        continue;
+
+                    oe.setValue(OutstandingEntry.VALUE_STRING_PROPERTY, value.toString());
                     oe.setValue(OutstandingEntry.CREATED_AT_PROPERTY, createdAt);
                     outstandingDao.createNew(oe);
                 }
diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
index 6e4084617..0329c6529 100644
--- a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
@@ -474,14 +474,16 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
         }
 
         userActivityDao.createNew(userActivity);
-        commentField.setText(""); //$NON-NLS-1$
+        if (commentField != null)
+            commentField.setText(""); //$NON-NLS-1$
 
         pendingCommentPicture = usePicture ? null : pendingCommentPicture;
         if (usePicture) {
             if (activity != null)
                 activity.getIntent().removeExtra(TaskEditFragment.TOKEN_PICTURE_IN_PROGRESS);
         }
-        pictureButton.setImageResource(cameraButton);
+        if (pictureButton != null)
+            pictureButton.setImageResource(cameraButton);
         StatisticsService.reportEvent(StatisticsConstants.ACTFM_TASK_COMMENT);
 
         setUpListAdapter();
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
index 609b185b2..b351abc48 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
@@ -886,6 +886,8 @@ public class TaskListFragment extends SherlockListFragment implements OnScrollLi
      * this occurs to save resources and time.
      */
     public void onScrollStateChanged(AbsListView view, int scrollState) {
+        if (taskAdapter == null)
+            return;
         switch (scrollState) {
         case OnScrollListener.SCROLL_STATE_IDLE:
             if (taskAdapter.isFling)