diff --git a/jupyter-notebook/docker-entrypoint.sh b/jupyter-notebook/docker-entrypoint.sh
index 74ba58f3..9a4a467a 100755
--- a/jupyter-notebook/docker-entrypoint.sh
+++ b/jupyter-notebook/docker-entrypoint.sh
@@ -3,6 +3,14 @@
 # SPDX-FileCopyrightText: Copyright DB Netz AG and the capella-collab-manager contributors
 # SPDX-License-Identifier: Apache-2.0
 
+handle_exit() {
+    exit_status=$?
+    if [ $exit_status -ne 0 ]; then
+        echo "---FAILURE_PREPARE_WORKSPACE---"
+    fi
+}
+trap handle_exit EXIT
+
 set -euo pipefail
 
 echo "---START_PREPARE_WORKSPACE---"