diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn
index 75dcb83..2bb0ddc 100644
--- a/pgw/PGW_Tests.ttcn
+++ b/pgw/PGW_Tests.ttcn
@@ -402,6 +402,7 @@
 		run_as_user := mp_run_prog_as_user,
 		tun_netns_name := g_pars.tun_netns_name
 	};
+	log("Starting a program: ", command);
 	var UECUPS_StartProgramRes res := f_gtp2_start_program(sprog);
 	if (res.result != OK) {
 		setverdict(fail, "Unable to start program '", command, "'");
@@ -413,6 +414,7 @@
 private function f_wait_term(integer pid, template (present) integer exit_code := 0,
 			     float tout := 10.0) runs on PGW_Session_CT
 {
+	var UECUPS_ProgramTermInd pti;
 	timer T := tout;
 
 	T.start;
@@ -420,8 +422,8 @@
 	[] GTP2.receive(UECUPS_ProgramTermInd:{pid := pid, exit_code := exit_code}) {
 		setverdict(pass);
 		}
-	[] GTP2.receive(UECUPS_ProgramTermInd:?) {
-		setverdict(fail, "Received unexpected ProgramTermInd");
+	[] GTP2.receive(UECUPS_ProgramTermInd:?) -> value pti {
+		setverdict(fail, "Received unexpected ProgramTermInd := ", pti);
 		}
 	[] T.timeout {
 		setverdict(fail, "timeout waiting for user-plane program termination");