diff --git a/coreapi/bellesip_sal/sal_sdp.c b/coreapi/bellesip_sal/sal_sdp.c
index c01d1d83b..dd7794b26 100644
--- a/coreapi/bellesip_sal/sal_sdp.c
+++ b/coreapi/bellesip_sal/sal_sdp.c
@@ -315,6 +315,12 @@ int sdp_to_media_description ( belle_sdp_session_description_t  *session_desc, S
 						; media_desc_it!=NULL
 			; media_desc_it=media_desc_it->next ) {
 		int nb_ice_candidates=0;
+	
+		if (desc->n_total_streams==SAL_MEDIA_DESCRIPTION_MAX_STREAMS){
+			ms_warning("Cannot convert mline at position [%i] from SDP to SalMediaDescription",desc->n_total_streams);
+			break;
+		}
+	
 		media_desc=BELLE_SDP_MEDIA_DESCRIPTION ( media_desc_it->data );
 		stream=&desc->streams[desc->n_total_streams];
 		media=belle_sdp_media_description_get_media ( media_desc );
diff --git a/oRTP b/oRTP
index 123ef1a55..37b81a118 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 123ef1a55c321826966a3a375bee09b558ae170d
+Subproject commit 37b81a118760caa22a5a89d56945acea9aa52523