diff --git a/bsc-nat/BSC_MS_ConnectionHandler.ttcn b/bsc-nat/BSC_MS_ConnectionHandler.ttcn
index 1f41434..27e1b58 100644
--- a/bsc-nat/BSC_MS_ConnectionHandler.ttcn
+++ b/bsc-nat/BSC_MS_ConnectionHandler.ttcn
@@ -52,7 +52,9 @@
 	create_cb := refers(CreateCallback),
 	unitdata_cb := refers(UnitdataCallback),
 	decode_dtap := false,
-	role_ms := true
+	role_ms := true,
+	sccp_addr_local := omit,
+	sccp_addr_peer := omit
 }
 
 
@@ -157,6 +159,9 @@
 			self.stop;
 			}
 
+		[] BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_CONF_IND) {
+			}
+
 		/* disconnect in invalid state */
 		[] BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND) {
 			setverdict(fail);