diff --git a/coreapi/friend.c b/coreapi/friend.c
index 853902b45f23dfbdb9cf085b550c05691bebe26a..05a1baeec3a7ed26013cc44a758b614042dc138f 100644
--- a/coreapi/friend.c
+++ b/coreapi/friend.c
@@ -444,6 +444,10 @@ LinphoneFriend *linphone_core_get_friend_by_address(const LinphoneCore *lc, cons
 	}
 	username=linphone_address_get_username(puri);
 	domain=linphone_address_get_domain(puri);
+	if (domain==NULL) {
+		linphone_address_destroy(puri);
+		return NULL;
+	}
 	for(elem=lc->friends;elem!=NULL;elem=ms_list_next(elem)){
 		lf=(LinphoneFriend*)elem->data;
 		const char *it_username=linphone_address_get_username(lf->uri);
diff --git a/mediastreamer2 b/mediastreamer2
index 2befd4c69cda862f32b1b7ee42db2a8606bae3b7..55a95502de5580ffe65225e0d96adeb218a58b7e 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 2befd4c69cda862f32b1b7ee42db2a8606bae3b7
+Subproject commit 55a95502de5580ffe65225e0d96adeb218a58b7e