diff --git a/coreapi/misc.c b/coreapi/misc.c
index 8e11a4348..d7233c977 100644
--- a/coreapi/misc.c
+++ b/coreapi/misc.c
@@ -912,7 +912,7 @@ void _update_local_media_description_from_ice(SalMediaDescription *desc, IceSess
 		if (result == TRUE) {
 			strncpy(desc->addr, rtp_candidate->taddr.ip, sizeof(desc->addr));
 		} else {
-			ms_warning("If ICE has completed successfully, rtp_addr should be set!");
+			ms_warning("If ICE has completed successfully, rtp_candidate should be set!");
 		}
 	}
 	else {
@@ -924,6 +924,7 @@ void _update_local_media_description_from_ice(SalMediaDescription *desc, IceSess
 		SalStreamDescription *stream = &desc->streams[i];
 		IceCheckList *cl = ice_session_check_list(session, i);
 		nb_candidates = 0;
+		rtp_candidate = rtcp_candidate = NULL;
 		if (!sal_stream_description_active(stream) || (cl == NULL)) continue;
 		if (ice_check_list_state(cl) == ICL_Completed) {
 			if (use_nortpproxy) stream->set_nortpproxy = TRUE;
diff --git a/mediastreamer2 b/mediastreamer2
index bdf34ccb0..85c5f163f 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit bdf34ccb02acb99f6ac7996a6d5e625d34dd47cf
+Subproject commit 85c5f163f534183eda22cfcefb099bd5c128ee34