diff --git a/dist/scripts/src/fetch-secrets.sh b/dist/scripts/src/fetch-secrets.sh
index ac1b80a..3331eb4 100755
--- a/dist/scripts/src/fetch-secrets.sh
+++ b/dist/scripts/src/fetch-secrets.sh
@@ -46,6 +46,11 @@ main() {
         env="$(jq -r .env <<<"${obj}")"
         filename="$(jq -r .filename <<<"${obj}")"
 
+        if [[ ${local_secret} == "null" || ${target_secret} == "null" ]]; then
+            printf "Error: Missing required fields in entry: %s\n" "${obj}" >&2
+            continue
+        fi
+
         # Default output file name
         output_file="${secrets_dir}/${local_secret}"