diff --git a/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/actions/zip/bulkaudit.yaml b/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/actions/zip/bulkaudit.yaml
index 4b9cf0eb18..0d8c3b8974 100644
--- a/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/actions/zip/bulkaudit.yaml
+++ b/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/actions/zip/bulkaudit.yaml
@@ -96,11 +96,13 @@ steps:
   - var.set:
       module: ssc
 
+  # Validate --aviator-app-mapping value
+  - if: ${!(cli['aviator-app-mapping'] matches 'app|version')}
+    throw: "Invalid --aviator-app-mapping value '${cli['aviator-app-mapping']}'. Valid values are: app, version"
+
   # Validate that at least one of --tag-mapping or --add-aviator-tags is specified
   - if: ${(cli['tag-mapping'] == null || cli['tag-mapping'] == '') && !cli['add-aviator-tags']}
-    do:
-      - log.progress: "ERROR: Either --tag-mapping or --add-aviator-tags must be specified."
-      - throw: "Either --tag-mapping or --add-aviator-tags must be specified."
+    throw: "Either --tag-mapping or --add-aviator-tags must be specified."
 
   - log.progress: "Using Aviator app mapping: ${cli['aviator-app-mapping']}"