diff --git a/build.sh b/build.sh
index 2cfb057..7443880 100755
--- a/build.sh
+++ b/build.sh
@@ -1,15 +1,13 @@
 #!/bin/bash
 
 # Exit on error
-set -e
+set -euo pipefail
 
 # DIRECTORIES
 SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 EXE_DIR="${SCRIPT_DIR}/output"
 PROJECTNAME="simple_object_storage"
 
-rm -f ${EXE_DIR}/*
-
 # FUNCTIONS
 function title() {
     echo "----------------------------------------"
@@ -41,8 +39,8 @@ cmake -B build_amd64 -DCMAKE_BUILD_TYPE=Release \
   -DCMAKE_EXE_LINKER_FLAGS="-static" \
   -DCMAKE_CXX_FLAGS="-march=x86-64" .
 cmake --build build_amd64 --target simple_object_storage --config Release -j"$JOBS"
-mkdir -p ${EXE_DIR}
-cp build_amd64/${PROJECTNAME} ${EXE_DIR}/${PROJECTNAME}.amd64
+mkdir -p "${EXE_DIR}"
+cp "build_amd64/${PROJECTNAME}" "${EXE_DIR}/${PROJECTNAME}.amd64"
 }
 
 function build_arm64() {
@@ -58,16 +56,19 @@ cmake -B build_arm64 -DCMAKE_BUILD_TYPE=Release \
   -DCMAKE_CXX_FLAGS="-march=armv8-a" \
   -DCMAKE_SYSTEM_PROCESSOR=aarch64 .
 cmake --build build_arm64 --target simple_object_storage --config Release -j"$JOBS"
-mkdir -p ${EXE_DIR}
-cp build_arm64/${PROJECTNAME} ${EXE_DIR}/${PROJECTNAME}.arm64
+mkdir -p "${EXE_DIR}"
+cp "build_arm64/${PROJECTNAME}" "${EXE_DIR}/${PROJECTNAME}.arm64"
 }
 
 #--------------------------------
 # MAIN
 #--------------------------------
-cd $SCRIPT_DIR
 
-mkdir -p ${EXE_DIR}
+OLD_DIR=$(pwd)
+cd "$SCRIPT_DIR"
+
+
+mkdir -p "${EXE_DIR}"
 
 BUILDSTR="amd64"
 
@@ -89,3 +90,4 @@ fi
 
 echo "Build completed successfully!"
 
+cd "$OLD_DIR"
\ No newline at end of file
diff --git a/test-docker.sh b/test-docker.sh
index 10a8192..7e2eb76 100755
--- a/test-docker.sh
+++ b/test-docker.sh
@@ -11,8 +11,18 @@ docker buildx build --load -t gitea.jde.nz/public/simple-object-storage:test --p
 
 export LOCALCONFIG="${SCRIPT_DIR}/.test-docker/config.json"
 
+if [ ! -f "${LOCALCONFIG}" ]; then
+    echo "Config file not found: ${LOCALCONFIG}"
+    exit 1
+fi
+
 COMPOSE_FILE="${SCRIPT_DIR}/.test-docker/compose.yaml"
 
+if [ ! -f "${COMPOSE_FILE}" ]; then
+    echo "Compose file not found: ${COMPOSE_FILE}"
+    exit 1
+fi
+
 docker compose -f "${COMPOSE_FILE}" up -d 
 
 "${SCRIPT_DIR}/test.sh" "http://localhost:7703"