diff --git a/src/android/org/linphone/assistant/AssistantActivity.java b/src/android/org/linphone/assistant/AssistantActivity.java
index c434ccae9..f51885f22 100644
--- a/src/android/org/linphone/assistant/AssistantActivity.java
+++ b/src/android/org/linphone/assistant/AssistantActivity.java
@@ -358,6 +358,10 @@ private static AssistantActivity instance;
 
 		try {
 			String identity = proxyConfig.getIdentity();
+            if (identity == null) {
+                LinphoneUtils.displayErrorAlert(getString(R.string.error), this);
+                return;
+            }
 			identity = identity.replace("?", accountCreator.getUsername());
 			addr = LinphoneCoreFactory.instance().createLinphoneAddress(identity);