diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
index e89293813..d8c2ecc8c 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
@@ -271,14 +271,17 @@ public class TagViewActivity extends TaskListActivity {
                     String oldName = tagData.getValue(TagData.NAME);
                     actFmSyncService.fetchTag(tagData);
 
-                    DialogUtilities.dismissDialog(getActivity(), progressDialog);
-                    getActivity().runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            if(noRemoteId && tagData.getValue(TagData.REMOTE_ID) > 0)
-                                refreshData(manual, true);
-                        }
-                    });
+                    Activity activity = getActivity();
+                    if (activity != null) {
+                        DialogUtilities.dismissDialog(activity, progressDialog);
+                        activity.runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                if(noRemoteId && tagData.getValue(TagData.REMOTE_ID) > 0)
+                                    refreshData(manual, true);
+                            }
+                        });
+                    }
 
                     if(!oldName.equals(tagData.getValue(TagData.NAME))) {
                         TagService.getInstance().rename(oldName,
@@ -304,27 +307,33 @@ public class TagViewActivity extends TaskListActivity {
         actFmSyncService.fetchTasksForTag(tagData, manual, new Runnable() {
             @Override
             public void run() {
-                getActivity().runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        loadTaskListContent(true);
-                        ((TextView)taskListView.findViewById(android.R.id.empty)).setText(R.string.TLA_no_items);
-                        DialogUtilities.dismissDialog(getActivity(), progressDialog);
-                    }
-                });
+                final Activity activity = getActivity();
+                if (activity != null) {
+                    activity.runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            loadTaskListContent(true);
+                            ((TextView)taskListView.findViewById(android.R.id.empty)).setText(R.string.TLA_no_items);
+                            DialogUtilities.dismissDialog(activity, progressDialog);
+                        }
+                    });
+                }
             }
         });
 
         actFmSyncService.fetchUpdatesForTag(tagData, manual, new Runnable() {
             @Override
             public void run() {
-                getActivity().runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        //refreshUpdatesList();
-                        DialogUtilities.dismissDialog(getActivity(), progressDialog);
-                    }
-                });
+                final Activity activity = getActivity();
+                if (activity != null) {
+                    getActivity().runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            //refreshUpdatesList();
+                            DialogUtilities.dismissDialog(activity, progressDialog);
+                        }
+                    });
+                }
             }
         });