diff --git a/src/android/org/linphone/ChatFragment.java b/src/android/org/linphone/ChatFragment.java
index 5b802c950..203162f43 100644
--- a/src/android/org/linphone/ChatFragment.java
+++ b/src/android/org/linphone/ChatFragment.java
@@ -400,6 +400,7 @@ public class ChatFragment extends Fragment implements OnClickListener, ChatMessa
 		} else {
 			try {
 				lAddress = lc.interpretUrl(sipUri);
+				if (lAddress == null) LinphoneActivity.instance().goToDialerFragment();
 			} catch (Exception e) {
 				//TODO Error popup
 				LinphoneActivity.instance().goToDialerFragment();
diff --git a/src/android/org/linphone/LinphoneActivity.java b/src/android/org/linphone/LinphoneActivity.java
index 3abbb46a6..35500965c 100644
--- a/src/android/org/linphone/LinphoneActivity.java
+++ b/src/android/org/linphone/LinphoneActivity.java
@@ -658,6 +658,7 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
 		Address lAddress = null;
 		if(sipUri != null) {
 			lAddress = LinphoneManager.getLc().interpretUrl(sipUri);
+			if (lAddress == null) return;
 			LinphoneContact contact = ContactsManager.getInstance().findContactFromAddress(lAddress);
 			displayName = contact != null ? contact.getFullName() : null;
 
diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java
index 1fd1d3528..201336b16 100644
--- a/src/android/org/linphone/LinphoneManager.java
+++ b/src/android/org/linphone/LinphoneManager.java
@@ -569,6 +569,7 @@ public class LinphoneManager implements CoreListener, ChatMessageListener, Senso
 
 		Address lAddress;
 		lAddress = mLc.interpretUrl(to);
+		if (lAddress == null) return;
 		if (mR.getBoolean(R.bool.forbid_self_call) && lpc != null && lAddress.asStringUriOnly().equals(lpc.getIdentityAddress())) {
 			return;
 		}
diff --git a/submodules/linphone b/submodules/linphone
index aaf0eac9c..c0a2fcd05 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit aaf0eac9c79b8f69abba752a29c6b12ce18ed957
+Subproject commit c0a2fcd05dd46f1202cee980127dd96db82f1855