diff --git a/coreapi/bellesip_sal/sal_op_call.c b/coreapi/bellesip_sal/sal_op_call.c
index c6e35e1db..a7e91639c 100644
--- a/coreapi/bellesip_sal/sal_op_call.c
+++ b/coreapi/bellesip_sal/sal_op_call.c
@@ -217,8 +217,8 @@ static void handle_sdp_from_response(SalOp* op,belle_sip_response_t* response) {
 	if (op->base.local_media) sdp_process(op);
 }
 
-void sal_call_cancel_invite(SalOp *op) {
-	sal_call_cancel_invite_with_info(op,NULL);
+int sal_call_cancel_invite(SalOp *op) {
+	return sal_call_cancel_invite_with_info(op,NULL);
 }
 
 static void cancelling_invite(SalOp *op, const SalErrorInfo *info) {
@@ -937,8 +937,14 @@ static belle_sip_header_reason_t *sal_call_make_reason_header( const SalErrorInf
 	return NULL;
 }
 
-void sal_call_cancel_invite_with_info(SalOp* op, const SalErrorInfo *info) {
+int sal_call_cancel_invite_with_info(SalOp* op, const SalErrorInfo *info) {
 	belle_sip_request_t* cancel;
+	
+	if (op->pending_client_trans == NULL){
+		ms_warning("There is no transaction to cancel.");
+		return -1;
+	}
+	
 	ms_message("Cancelling INVITE request from [%s] to [%s] ",sal_op_get_from(op), sal_op_get_to(op));
 	cancel = belle_sip_client_transaction_create_cancel(op->pending_client_trans);
 	if (cancel){
@@ -947,6 +953,7 @@ void sal_call_cancel_invite_with_info(SalOp* op, const SalErrorInfo *info) {
 			belle_sip_message_add_header(BELLE_SIP_MESSAGE(cancel),BELLE_SIP_HEADER(reason));
 		}
 		sal_op_send_request(op,cancel);
+		return 0;
 	}else if (op->dialog){
 		belle_sip_dialog_state_t state = belle_sip_dialog_get_state(op->dialog);;
 		/*case where the response received is invalid (could not establish a dialog), but the transaction is not cancellable
@@ -962,6 +969,7 @@ void sal_call_cancel_invite_with_info(SalOp* op, const SalErrorInfo *info) {
 			break;
 		}
 	}
+	return -1;
 }
 
 int sal_call_decline(SalOp *op, SalReason reason, const char *redirection /*optional*/){
diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 00265f377..4fc887048 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -6104,8 +6104,9 @@ void linphone_call_repair_if_broken(LinphoneCall *call){
 		case LinphoneCallPausing:
 			if (sal_call_dialog_request_pending(call->op)) {
 				/* Need to cancel first re-INVITE as described in section 5.5 of RFC 6141 */
-				sal_call_cancel_invite(call->op);
-				call->reinvite_on_cancel_response_requested = TRUE;
+				if (sal_call_cancel_invite(call->op) == 0){
+					call->reinvite_on_cancel_response_requested = TRUE;
+				}
 			}
 			break;
 		case LinphoneCallStreamsRunning:
@@ -6124,8 +6125,9 @@ void linphone_call_repair_if_broken(LinphoneCall *call){
 			break;
 		case LinphoneCallOutgoingInit:
 		case LinphoneCallOutgoingProgress:
-			sal_call_cancel_invite(call->op);
-			call->reinvite_on_cancel_response_requested = TRUE;
+			if (sal_call_cancel_invite(call->op) == 0){
+				call->reinvite_on_cancel_response_requested = TRUE;
+			}
 			break;
 		case LinphoneCallOutgoingEarlyMedia:
 		case LinphoneCallOutgoingRinging:
diff --git a/include/sal/sal.h b/include/sal/sal.h
index 0aa5073ae..e108abc37 100644
--- a/include/sal/sal.h
+++ b/include/sal/sal.h
@@ -749,8 +749,8 @@ int sal_call_accept(SalOp*h);
 int sal_call_decline(SalOp *h, SalReason reason, const char *redirection /*optional*/);
 int sal_call_decline_with_error_info(SalOp *h, const SalErrorInfo* info, const char *redirection /*optional*/);
 int sal_call_update(SalOp *h, const char *subject, bool_t no_user_consent);
-void sal_call_cancel_invite(SalOp *op);
-void sal_call_cancel_invite_with_info(SalOp* op, const SalErrorInfo *info);
+int sal_call_cancel_invite(SalOp *op);
+int sal_call_cancel_invite_with_info(SalOp* op, const SalErrorInfo *info);
 SalMediaDescription * sal_call_get_remote_media_description(SalOp *h);
 LINPHONE_PUBLIC SalMediaDescription * sal_call_get_final_media_description(SalOp *h);
 int sal_call_refer(SalOp *h, const char *refer_to);