diff --git a/scripts/harb-evaluator/bootstrap-light.sh b/scripts/harb-evaluator/bootstrap-light.sh
index 745f993..1a03f29 100755
--- a/scripts/harb-evaluator/bootstrap-light.sh
+++ b/scripts/harb-evaluator/bootstrap-light.sh
@@ -41,8 +41,11 @@ echo "$DEPLOY_OUT" | grep -E "^\[|deployed|complete|Summary" || true
 
 # 4. Extract addresses from output and write deployments-local.json
 KRK=$(echo "$DEPLOY_OUT" | grep -oP 'Kraiken deployed: \K0x[a-fA-F0-9]+')
+[[ -n "$KRK" ]] || die "Could not extract Kraiken address from deploy output"
 STAKE=$(echo "$DEPLOY_OUT" | grep -oP 'Stake deployed: \K0x[a-fA-F0-9]+')
+[[ -n "$STAKE" ]] || die "Could not extract Stake address from deploy output"
 OPT=$(echo "$DEPLOY_OUT" | grep -oP 'Optimizer deployed: \K0x[a-fA-F0-9]+')
+[[ -n "$OPT" ]] || die "Could not extract Optimizer address from deploy output"
 LM=$(echo "$DEPLOY_OUT" | grep -oP 'LiquidityManager deployed: \K0x[a-fA-F0-9]+')
 
 [[ -n "$LM" ]] || die "Could not extract LiquidityManager address from deploy output"