diff --git a/src/android/org/linphone/LinphoneUtils.java b/src/android/org/linphone/LinphoneUtils.java
index a66f3ed75..171c9cae2 100644
--- a/src/android/org/linphone/LinphoneUtils.java
+++ b/src/android/org/linphone/LinphoneUtils.java
@@ -541,7 +541,7 @@ public final class LinphoneUtils {
 	public static String getFullAddressFromUsername(String username) {
 		String sipAddress = username;
 		Core lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
-		if (lc == null) return sipAddress;
+		if (lc == null || username == null) return sipAddress;
 
 		if (!sipAddress.startsWith("sip:")) {
 			sipAddress = "sip:" + sipAddress;
diff --git a/submodules/linphone b/submodules/linphone
index a9e3caf17..aaf0eac9c 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit a9e3caf17f8c233f5ab9a517a1382c6fd3453a24
+Subproject commit aaf0eac9c79b8f69abba752a29c6b12ce18ed957