diff --git a/tcl/target/nrf52.cfg b/tcl/target/nrf52.cfg
index 0c82c5758..a9121d356 100644
--- a/tcl/target/nrf52.cfg
+++ b/tcl/target/nrf52.cfg
@@ -133,8 +133,7 @@ proc _proc_pre_enable_$_CHIPNAME.tpiu {_targetname _chipname} {
 		0x52832 {
 			if { [$_chipname.tpiu cget -protocol] eq "sync" } {
 				if { [$_chipname.tpiu cget -port-width] != 4 } {
-					echo "Error. Device only supports 4-bit sync traces."
-					return
+					error "Device only supports 4-bit sync traces"
 				}
 
 				# Set TRACECONFIG.TRACEMUX to enable synchronous trace
@@ -154,12 +153,10 @@ proc _proc_pre_enable_$_CHIPNAME.tpiu {_targetname _chipname} {
 		0x52811 -
 		0x52810 -
 		0x52805 {
-			echo "Error: Device does not support TPIU"
-			return
+			error "Device does not support TPIU"
 		}
 		default {
-			echo "Error: Unknown device"
-			return
+			error "Unknown device, cannot configure TPIU"
 		}
 	}
 }