diff --git a/repos/gems/run/depot_autopilot.run b/repos/gems/run/depot_autopilot.run
index 051bda3960..9b8bd6c61d 100644
--- a/repos/gems/run/depot_autopilot.run
+++ b/repos/gems/run/depot_autopilot.run
@@ -38,14 +38,20 @@ proc autopilot_wait_for_output { wait_for_re timeout_value running_spawn_id } {
 		-i $running_spawn_id $platform_msg { puts stderr "Error: platform rebooted unexpectedly"; exit -4 }
 		-i $running_spawn_id -re $wait_for_re { }
 
+		# sel4
+		-i $running_spawn_id -re {Error: ~Cnode - not implemented.*?\n} {
+			puts stderr "Error: Core presumably went out of resources";
+			set run_genode_failed 1
+			return
+		}
 		# pistachio kernel fault
-		-i $running_spawn_id -re {--- "KD# Exception caught" ---} {
+		-i $running_spawn_id -re {--- "KD# Exception caught" ---.*?\n} {
 			puts stderr "Error: Kernel fault";
 			set run_genode_failed 1
 			return
 		}
 		# sel4 unknown fault caught by core
-		-i $running_spawn_id -re {Error: unexpected exception during fault.*stopped} {
+		-i $running_spawn_id -re {Error: unexpected exception during fault.*?stopped.*?\n} {
 			puts stderr "Error: Unknown fault";
 			set run_genode_failed 1
 			return