diff --git a/rootfs/usr/local/bin/start-runners b/rootfs/usr/local/bin/start-runners
index 9dd446f..356919a 100755
--- a/rootfs/usr/local/bin/start-runners
+++ b/rootfs/usr/local/bin/start-runners
@@ -2,6 +2,9 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 set -e
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+trap 'retVal=$?; echo "❌ Fatal error occurred: Exit code $retVal at line $LINENO in command: $BASH_COMMAND"; kill -TERM 1' ERR
+trap 'retVal=$?;if [ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ]; then rm -Rf "$SERVICE_PID_FILE"; fi;exit $retVal' SIGINT SIGTERM SIGPWR
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Function to __log messages with timestamp
 __log() { echo "[$(date '+%Y-%m-%d %H:%M:%S')] $1" >"$RUNNERS_LOG_DIR/runners" 2>&1; }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -