diff --git a/src/com/android/dialer/SpecialCharSequenceMgr.java b/src/com/android/dialer/SpecialCharSequenceMgr.java
index 45c22fd..2e35019 100644
--- a/src/com/android/dialer/SpecialCharSequenceMgr.java
+++ b/src/com/android/dialer/SpecialCharSequenceMgr.java
@@ -229,7 +229,7 @@
                     };
 
                     SelectPhoneAccountDialogFragment.showAccountDialog(
-                            ((Activity) context).getFragmentManager(), false, phoneAccountHandles,
+                            ((Activity) context).getFragmentManager(), phoneAccountHandles,
                             listener);
                 } else {
                     return false;
@@ -290,7 +290,7 @@
                 };
 
                 SelectPhoneAccountDialogFragment.showAccountDialog(
-                        ((Activity) context).getFragmentManager(), false, phoneAccountHandles,
+                        ((Activity) context).getFragmentManager(), phoneAccountHandles,
                         listener);
             }
             return true;
diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java
index 50520bb..5e762c7 100644
--- a/src/com/android/dialer/calllog/CallLogAdapter.java
+++ b/src/com/android/dialer/calllog/CallLogAdapter.java
@@ -1071,7 +1071,8 @@
                     public void onClick(View v) {
                         final Intent intent =
                                 DialtactsActivity.getAddNumberToContactIntent(details.number);
-                        mContext.startActivity(intent);
+                        DialerUtils.startActivityWithErrorToast(mContext, intent,
+                                R.string.add_contact_not_available);
                     }
                 });
                 mBadgeImageView.setImageResource(R.drawable.ic_person_add_24dp);
