diff --git a/src/android/org/linphone/contacts/SearchContactsListAdapter.java b/src/android/org/linphone/contacts/SearchContactsListAdapter.java
index 1b74b96d3..8dc4ff2fa 100644
--- a/src/android/org/linphone/contacts/SearchContactsListAdapter.java
+++ b/src/android/org/linphone/contacts/SearchContactsListAdapter.java
@@ -86,7 +86,9 @@ public class SearchContactsListAdapter extends BaseAdapter {
 
 	private boolean contactIsSelected(ContactAddress ca) {
 		for (ContactAddress c : contactsSelected) {
-			if (c.getAddress().asStringUriOnly().compareTo(ca.getAddress().asStringUriOnly()) == 0) return true;
+			Address addr = c.getAddress();
+			if (addr == null) continue;
+			if (addr.asStringUriOnly().compareTo(ca.getAddress().asStringUriOnly()) == 0) return true;
 		}
 		return false;
 	}
@@ -166,7 +168,7 @@ public class SearchContactsListAdapter extends BaseAdapter {
 			searchAddress = search;
 		}
 
-        boolean searchFound = false;
+		boolean searchFound = false;
 		if (search != null) {
 			for (ContactAddress c : (search.length() < oldSize) ? getContactsList() : getContacts()) {
 				String address = c.getAddressAsDisplayableString();
diff --git a/submodules/linphone b/submodules/linphone
index 9c904e798..2fb4ce6ff 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 9c904e7982c661b5a96fa34cbb3aa793e98cf7a8
+Subproject commit 2fb4ce6ffc3657719e88c2ae7c97e9f17730962a