diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn
index 102c30edb..9f67f1b67 100644
--- a/bsc/MSC_ConnectionHandler.ttcn
+++ b/bsc/MSC_ConnectionHandler.ttcn
@@ -939,18 +939,28 @@ runs on MSC_ConnHdlr {
 	 (not st.is_assignment and (st.modify_done or not exp_modify))) and
 	 exp_compl] BSSAP.receive(tr_BSSMAP_AssignmentComplete) {
 		setverdict(fail, "Received non-matching ASSIGNMENT COMPLETE");
+		all component.stop;
+		mtc.stop;
 		}
 	[exp_compl] BSSAP.receive(tr_BSSMAP_AssignmentFail) {
 		setverdict(fail, "Received unexpected ASSIGNMENT FAIL");
+		all component.stop;
+		mtc.stop;
 		}
 	[not exp_compl] BSSAP.receive(tr_BSSMAP_AssignmentComplete) {
 		setverdict(fail, "Received unexpected ASSIGNMENT COMPLETE");
+		all component.stop;
+		mtc.stop;
 		}
 	[not exp_compl] BSSAP.receive(tr_BSSMAP_AssignmentFail) {
 		setverdict(fail, "Received non-matching ASSIGNMENT FAIL");
+		all component.stop;
+		mtc.stop;
 		}
 	[] T.timeout {
 		setverdict(fail, "Timeout waiting for ASSIGNMENT COMPLETE");
+		all component.stop;
+		mtc.stop;
 		}
 	}
 	log("g_media ", g_media);