diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
index 9be7d346b..7b2fd73e8 100644
--- a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
@@ -203,7 +203,7 @@ public class TaskListActivity extends AstridActivity implements OnFilterItemClic
             completed.setEnabled(false);
         } else if(tlf instanceof TagViewFragment) {
             menu.findItem(R.id.menu_tag_settings).setVisible(true);
-        } else {
+        } else if (tlf != null) {
             Filter filter = tlf.getFilter();
             if(filter != null && filter instanceof CustomFilter && ((CustomFilter) filter).getId() > 0) {
                 menu.findItem(R.id.menu_filter_settings).setVisible(true);