diff --git a/manifest-build.yml b/manifest-build.yml
index 29530c210712f27d07550e8dbd0b57f231177298..b0987e7c7309ef59e1e21f66853439ec75d8ce4e 100644
--- a/manifest-build.yml
+++ b/manifest-build.yml
@@ -152,13 +152,17 @@ variables:
 
       # Generate AlphaPlan FWR articles if release tag is set
       apscript=".gitlab-ci/alphaplan_fwr.py"
-      [ ! -x "${apscript}" ] && script=".repo/manifests/${apscript}"
-      [ ! -x "${apscript}" ] && echo "Failed to find alphaplan_fwr script"
 
       #if [ -n "$CI_COMMIT_TAG" ] && \
       echo "CI AP debug mode"
       if true && \
+        [ -d "${ARTIFACTS_IMAGE_PATH}" ] && \
         [[ "${CI_PARAM_PACKAGE_FTP}" == "false" ]];then
+        # Check if alphaplan fwr script is available
+        [ ! -x "${apscript}" ] && \
+          echo "Failed to find alphaplan_fwr script" && \
+          exit 1
+        # Call script
         ${apscript} \
               --images-dir="${ARTIFACTS_IMAGE_PATH}" \
               --outputdir-local=${outdir} \