diff --git a/src/nacc_fsm.c b/src/nacc_fsm.c
index 85e29c5..fcf4b58 100644
--- a/src/nacc_fsm.c
+++ b/src/nacc_fsm.c
@@ -342,7 +342,7 @@
 
 err_term:
 	talloc_free(cmd);
-	osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL);
+	nacc_fsm_state_chg(fi, NACC_ST_TX_CELL_CHG_CONTINUE);
 }
 
 
@@ -383,14 +383,14 @@
 
 	/* SI info not in cache, resolve it using RIM procedure against SGSN */
 	if (fill_rim_ran_info_req(ctx, &pdu) < 0) {
-		osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL);
+		nacc_fsm_state_chg(fi, NACC_ST_TX_CELL_CHG_CONTINUE);
 		return;
 	}
 
 	rc = bssgp_tx_rim(&pdu, gprs_ns2_nse_nsei(ctx->ms->bts->nse));
 	if (rc < 0) {
 		LOGPFSML(fi, LOGL_ERROR, "Failed transmitting RIM PDU: %d\n", rc);
-		osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL);
+		nacc_fsm_state_chg(fi, NACC_ST_TX_CELL_CHG_CONTINUE);
 		return;
 	}
 }
@@ -578,7 +578,7 @@
 		 cmd->type, cmd->variable, osmo_escape_str(cmd->reply, -1));
 
 	if (cmd->type != CTRL_TYPE_GET_REPLY || !cmd->reply) {
-		osmo_fsm_inst_term(ctx->fi, OSMO_FSM_TERM_ERROR, NULL);
+		nacc_fsm_state_chg(ctx->fi, NACC_ST_TX_CELL_CHG_CONTINUE);
 		return;
 	}
 
@@ -618,7 +618,7 @@
 
 free_ret:
 	talloc_free(tmp);
-	osmo_fsm_inst_term(ctx->fi, OSMO_FSM_TERM_ERROR, NULL);
+	nacc_fsm_state_chg(ctx->fi, NACC_ST_TX_CELL_CHG_CONTINUE);
 	return;
 }