diff --git a/coreapi/quality_reporting.c b/coreapi/quality_reporting.c
index 58484cad7..df19240d8 100644
--- a/coreapi/quality_reporting.c
+++ b/coreapi/quality_reporting.c
@@ -235,7 +235,8 @@ static void reporting_publish(const LinphoneCall* call, const reporting_session_
 
 	// if the call was hungup too early, we might have invalid IPs information
 	// in that case, we abort the report since it's not useful data
-	if (strlen(report->info.local_addr.ip) == 0 || strlen(report->info.remote_addr.ip) == 0) {
+	if (report->info.local_addr.ip == NULL || strlen(report->info.local_addr.ip) == 0
+		|| report->info.remote_addr.ip == NULL || strlen(report->info.remote_addr.ip) == 0) {
 		ms_warning("The call was hang up too early (duration: %d sec) and IP could "
 			"not be retrieved so dropping this report", linphone_call_get_duration(call));
 		return;
diff --git a/mediastreamer2 b/mediastreamer2
index 69cf3ba35..f6c6813f0 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 69cf3ba35c3533f8092b177bdc854a6fb45ceaa3
+Subproject commit f6c6813f0cdffaaa290d3933b7f6a92d586bae72