diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 5e486370c..c63616231 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -1069,11 +1069,13 @@ LinphoneCall * linphone_call_new_incoming(LinphoneCore *lc, LinphoneAddress *fro
 		// It is licit to receive an INVITE without SDP
 		// In this case WE chose the media parameters according to policy.
 		linphone_call_set_compatible_incoming_call_parameters(call, md);
-		  /* set multicast role & address if any*/
-		for (i=0;i<md->nb_streams;i++){
-			if (!sal_call_is_offerer(op) && ms_is_multicast(md->streams[i].rtp_addr)){
-				md->streams[i].multicast_role = SalMulticastReceiver;
-				strncpy(call->media_ports[i].multicast_ip,md->streams[i].rtp_addr,sizeof(call->media_ports[i].multicast_ip));
+		/* set multicast role & address if any*/
+		if (!sal_call_is_offerer(op)){
+			for (i=0;i<md->nb_streams;i++){
+				if (md->streams[i].rtp_addr[0]!='\0' && ms_is_multicast(md->streams[i].rtp_addr)){
+					md->streams[i].multicast_role = SalMulticastReceiver;
+					strncpy(call->media_ports[i].multicast_ip,md->streams[i].rtp_addr,sizeof(call->media_ports[i].multicast_ip));
+				}
 			}
 		}
 	}
diff --git a/mediastreamer2 b/mediastreamer2
index 175a46b05..78b425a09 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 175a46b05d85a9dec2e5b3671db59340f1c3bd25
+Subproject commit 78b425a093453a43a5a75ca8caf88639e4569aa3
diff --git a/oRTP b/oRTP
index 6ac50c131..ebca7f042 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 6ac50c1315aecb4a419b220af51e6361e7ee7813
+Subproject commit ebca7f042c83c6211a3aa6d0801ec6d70811f4f2