diff --git a/administration/shellcheck.sh b/administration/shellcheck.sh
index 5aec32c..f814483 100644
--- a/administration/shellcheck.sh
+++ b/administration/shellcheck.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
-cd "$(dirname "$(readlink -f "${0}")")/" &&
+cd "$(dirname "$(readlink -f "${0}")")/" || exit 1
+echo "Run shellcheck..."
 shellcheck ./*.sh
diff --git a/administration/test-everything.sh b/administration/test-everything.sh
index 27e2630..df55d66 100644
--- a/administration/test-everything.sh
+++ b/administration/test-everything.sh
@@ -4,3 +4,4 @@ bash ./clear.sh &&
 bash ./schema-validate.sh &&
 bash ./test.sh &&
 bash ./test-code-format.sh
+bash ./shellcheck.sh