diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn
index d6a0403..48cf725 100644
--- a/ggsn_tests/GGSN_Tests.ttcn
+++ b/ggsn_tests/GGSN_Tests.ttcn
@@ -1184,8 +1184,8 @@
 		alt {
 			[] GTPU.receive(tr_GTPU_GPDU(g_peer_u, ?)) -> value ud {
 				if (f_verify_gtpu_txseq(ud.gtpu, use_gtpu_txseq) == false) {
-					setverdict(fail);
-					stop;
+					Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+								log2str("Received GTPU with wrong txseq while waiting for ICMPv6: ", expected));
 				}
 				var octetstring gpdu := ud.gtpu.gtpu_IEs.g_PDU_IEs.data;
 				var IPv6_packet ip6 := f_IPv6_dec(gpdu);
@@ -1203,8 +1203,14 @@
 				}
 			}
 			[] GTPU.receive(tr_GTPU_GPDU(?, ?)) { repeat; }
-			[] GTPU.receive { setverdict(fail); }
-			[] T_default.timeout { setverdict(fail); }
+			[] GTPU.receive  {
+				Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+							log2str("Received unexpected GTPU while waiting for ICMPv6: ", expected));
+			}
+			[] T_default.timeout {
+				Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+							log2str("Timeout waiting for ICMPv6: ", expected));
+			}
 		}
 		T_default.stop;
 	}