diff --git a/coreapi/chat_file_transfer.c b/coreapi/chat_file_transfer.c
index bca204f50..6669257d4 100644
--- a/coreapi/chat_file_transfer.c
+++ b/coreapi/chat_file_transfer.c
@@ -100,9 +100,11 @@ static int linphone_chat_message_file_transfer_on_send_body(belle_sip_user_body_
 	LinphoneCore *lc = NULL;
 	char *buf = (char *)buffer;
 
-	if (msg->http_request && !file_transfer_in_progress_and_valid(msg)) {
-		ms_warning("Cancelled request for %s msg [%p], ignoring %s", msg->chat_room?"":"ORPHAN", msg, __FUNCTION__);
-		_release_http_request(msg);
+	if (!file_transfer_in_progress_and_valid(msg)) {
+		if (msg->http_request) {
+			ms_warning("Cancelled request for %s msg [%p], ignoring %s", msg->chat_room?"":"ORPHAN", msg, __FUNCTION__);
+			_release_http_request(msg);
+		}
 		return BELLE_SIP_STOP;
 	}
 
diff --git a/tester/call_multi_tester.c b/tester/call_multi_tester.c
index f73698964..2ea1fc17d 100644
--- a/tester/call_multi_tester.c
+++ b/tester/call_multi_tester.c
@@ -775,7 +775,9 @@ static void eject_from_4_participants_conference(void) {
 	pauline_called_by_marie=linphone_core_get_current_call(pauline->lc);
 	BC_ASSERT_TRUE(pause_call_1(marie,marie_call_pauline,pauline,pauline_called_by_marie));
 
-	BC_ASSERT_TRUE(call(marie,michelle));
+	if (!BC_ASSERT_TRUE(call(marie,michelle)))
+		goto end;
+
 	marie_call_michelle=linphone_core_get_current_call(marie->lc);
 	michelle_called_by_marie=linphone_core_get_current_call(michelle->lc);
 	BC_ASSERT_TRUE(pause_call_1(marie,marie_call_michelle,michelle,michelle_called_by_marie));