diff --git a/utils/scripts/build/linux-build.sh b/utils/scripts/build/linux-build.sh
index 85c063a19..ea5df1b66 100755
--- a/utils/scripts/build/linux-build.sh
+++ b/utils/scripts/build/linux-build.sh
@@ -43,6 +43,10 @@ mkdir logs
 ln -s ./quests/lua_modules ./lua_modules
 ln -s ./quests/plugins ./plugins
 
+while [ ! -f /tmp/import-done ]; do
+    sleep 1  # Wait for 1 second before checking again
+done
+
 echo "# Running world database updates"
 FORCE_INTERACTIVE=1 ./bin/world database:updates --skip-backup --force
 
@@ -50,7 +54,12 @@ echo "# Running shared_memory"
 ./bin/shared_memory
 
 echo "# Running NPC hand-in tests"
-./bin/zone tests:npc-handins
+./bin/zone tests:npc-handins 2>&1 | tee test_output.log
+
+if grep -E -q "QueryErr|Error" test_output.log; then
+    echo "Error found in test output! Failing build."
+    exit 1
+fi
 
 # shellcheck disable=SC2164
 cd /drone/src/
diff --git a/utils/scripts/build/source-db-build.sh b/utils/scripts/build/source-db-build.sh
index e62b5eb97..69d2b2856 100644
--- a/utils/scripts/build/source-db-build.sh
+++ b/utils/scripts/build/source-db-build.sh
@@ -88,3 +88,5 @@ rm -rf /tmp/db/
 rm -rf ${COMBINED_DIR}
 
 echo "Database import complete!"
+
+touch /tmp/import-done