diff --git a/scripts/make.sh b/scripts/make.sh
index ce2af7d..80c5c54 100755
--- a/scripts/make.sh
+++ b/scripts/make.sh
@@ -28,11 +28,11 @@ function setupJson() {
 
 makeNextSubmodule() {
   log "Making ${1}"
-  pushd "submodules/${1}/"
+  pushd "submodules/${1}/" || exit
   npm install
   npm audit fix
   npm run export
-  popd
+  popd || exit
   linkTarget="$PWD/nextStatic/${2}"
   if [ ! -f "${linkTarget}" ]; then
     ln -sf "$PWD/submodules/${1}/out" "${linkTarget}"
@@ -83,10 +83,10 @@ touch publicDirs/qminingPublic/motd
 
 if [ -z "$(ls -A ./data/dbs)" ]; then
   log "Making DB-s"
-  pushd src/standaloneUtils
+  pushd src/standaloneUtils || exit
   NS_LOGLEVEL=2 node dbSetup.js
-  mv *.db ../../data/dbs
-  popd
+  mv ./*.db ../../data/dbs
+  popd || exit
 fi
 
 log "Disabling next telemetry"