diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 9c12c9834..238740eda 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -307,7 +307,11 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
     @Override
     protected void onStop() {
         super.onStop();
-        unregisterReceiver(tagDeletedReceiver);
+        try {
+            unregisterReceiver(tagDeletedReceiver);
+        } catch (IllegalArgumentException e) {
+            // Receiver might not be registered if for example activity is stopped before on resume (?)
+        }
     }
 
     public void setSelectedItem(Filter item) {