diff --git a/library/Osmocom_CTRL_Functions.ttcn b/library/Osmocom_CTRL_Functions.ttcn
index 8bd6025..04848ce 100644
--- a/library/Osmocom_CTRL_Functions.ttcn
+++ b/library/Osmocom_CTRL_Functions.ttcn
@@ -15,6 +15,7 @@
 		T.start;
 		alt {
 		[] pt.receive(tr_CtrlMsgGetRepl(id, variable)) -> value rx { }
+		[] pt.receive(tr_CtrlMsgTrap) { repeat; }
 		[] pt.receive(tr_CtrlMsgError) -> value rx {
 			setverdict(fail, "Error in CTRL GET ", variable, ": ", rx.err.reason);
 			}
@@ -34,6 +35,7 @@
 		T.start;
 		alt {
 		[] pt.receive(tr_CtrlMsgSetRepl(id, variable, val)) { }
+		[] pt.receive(tr_CtrlMsgTrap) { repeat; }
 		[] pt.receive(tr_CtrlMsgError) -> value rx {
 			setverdict(fail, "Error in CTRL GET ", variable, ": ", rx.err.reason);
 			}