diff --git a/birdhouse/pavics-compose.sh b/birdhouse/pavics-compose.sh
index 16f309458..503fcbd75 100755
--- a/birdhouse/pavics-compose.sh
+++ b/birdhouse/pavics-compose.sh
@@ -56,7 +56,7 @@ read_configs # this sets ALL_CONF_DIRS
 . "${COMPOSE_DIR}/scripts/get-services-json.include.sh"
 . "${COMPOSE_DIR}/scripts/get-version-json.include.sh"
 
-check_required_vars
+check_required_vars || exit $?
 
 ## check fails when root access is required to access this file.. workaround possible by going through docker daemon... but
 # will add delay
diff --git a/birdhouse/scripts/read-configs.include.sh b/birdhouse/scripts/read-configs.include.sh
index b8e467c37..818801493 100644
--- a/birdhouse/scripts/read-configs.include.sh
+++ b/birdhouse/scripts/read-configs.include.sh
@@ -241,7 +241,7 @@ check_required_vars() {
         if [ -z "`eval "echo ${v}"`" ]
         then
             log ERROR "Required variable $v is not set. Check env.local file."
-            exit 1
+            return 1
         fi
     done
 }