diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
index d86cd3d6c..e139f516f 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
@@ -486,13 +486,13 @@ public class TagViewActivity extends TaskListActivity implements OnTabChangeList
                 try {
                     String oldName = tagData.getValue(TagData.NAME);
                     actFmSyncService.fetchTag(tagData);
-                    if(noRemoteId && tagData.getValue(TagData.REMOTE_ID) > 0) {
-                        refreshData(manual, true);
-                    }
 
+                    DialogUtilities.dismissDialog(TagViewActivity.this, progressDialog);
                     runOnUiThread(new Runnable() {
                         @Override
                         public void run() {
+                            if(noRemoteId && tagData.getValue(TagData.REMOTE_ID) > 0)
+                                refreshData(manual, true);
                             refreshSettingsPage();
                         }
                     });
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java
index 798346266..72977f3cf 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java
@@ -145,6 +145,8 @@ public final class TagsControlSet implements TaskEditControlSet {
             tagItem = inflater.inflate(R.layout.tag_edit_row, null);
             tagsContainer.addView(tagItem);
         }
+        if(tagName == null)
+            tagName = ""; //$NON-NLS-1$
 
         final AutoCompleteTextView textView = (AutoCompleteTextView)tagItem.
             findViewById(R.id.text1);
@@ -214,4 +216,4 @@ public final class TagsControlSet implements TaskEditControlSet {
         TextView lastText = (TextView) lastItem.findViewById(R.id.text1);
         return lastText;
     }
-}
\ No newline at end of file
+}
diff --git a/astrid/res/layout/contact_adapter_row.xml b/astrid/res/layout/contact_adapter_row.xml
index 898732e86..521ce3f09 100644
--- a/astrid/res/layout/contact_adapter_row.xml
+++ b/astrid/res/layout/contact_adapter_row.xml
@@ -10,7 +10,7 @@
     android:orientation="horizontal">
         
     <!-- picture thumbnail -->
-    <greendroid.widget.AsyncImageView android:id="@android:id/icon"
+    <greendroid.widget.AsyncImageView android:id="@+id/icon"
         android:layout_width="40dip"
         android:layout_height="44dip"
         android:gravity="center"
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
index 65ebe82fc..4fd0146a7 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -496,7 +496,7 @@ public final class TaskEditActivity extends TabActivity {
             return;
 
         String processedToast = addDueTimeToToast(toast.toString());
-        if(!onPause && !peopleControlSet.saveSharingSettings(processedToast))
+        if(!onPause && peopleControlSet != null && !peopleControlSet.saveSharingSettings(processedToast))
             return;
 
         finish();
diff --git a/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java b/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java
index d42f9cc15..99e77b435 100644
--- a/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java
+++ b/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java
@@ -70,7 +70,7 @@ public class ContactListAdapter extends CursorAdapter {
     public void bindView(View view, Context context, Cursor cursor) {
         TextView text1 = (TextView) view.findViewById(android.R.id.text1);
         TextView text2 = (TextView) view.findViewById(android.R.id.text2);
-        ImageView imageView = (ImageView) view.findViewById(android.R.id.icon);
+        ImageView imageView = (ImageView) view.findViewById(R.id.icon);
 
         if(cursor.getColumnNames().length == PEOPLE_PROJECTION.length) {
             int name = cursor.getColumnIndexOrThrow(ContactsContract.Contacts.DISPLAY_NAME);