diff --git a/.post-commit-hook b/.post-commit-hook
index f56ff6c..879fe07 100755
--- a/.post-commit-hook
+++ b/.post-commit-hook
@@ -1,8 +1,10 @@
 #!/usr/bin/env bash
 
+set -e
+
 BASE_IMAGE=$(git config get toolbox-dev-env.base-image.name)
-if git config get toolbox-dev-env.base-image.version-script; then
-    BASE_IMAGE_VERSION=eval $(git config get toolbox-dev-env.base-image.version-script)
+if git config get toolbox-dev-env.base-image.version-script &>/dev/null; then
+    BASE_IMAGE_VERSION=$(eval $(git config get toolbox-dev-env.base-image.version-script))
 else
     BASE_IMAGE_VERSION=$(git config get toolbox-dev-env.base-image.version)
 fi