diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
index 2e403f4a7..dd5c7eeb4 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
@@ -955,7 +955,8 @@ public class EditPeopleControlSet extends PopupControlSet {
                     assignedCustom.setText(email);
                     dontClearAssignedCustom = true;
                     refreshDisplayView();
-                    dialog.dismiss();
+                    if (dialog != null)
+                        dialog.dismiss();
                 } else {
                     DialogUtilities.okDialog(activity, activity.getString(R.string.TEA_contact_error), null);
                 }