diff --git a/ccdImports/conversionScripts/createAllXLS.sh b/ccdImports/conversionScripts/createAllXLS.sh
index fd6df6d613..a2994876ca 100755
--- a/ccdImports/conversionScripts/createAllXLS.sh
+++ b/ccdImports/conversionScripts/createAllXLS.sh
@@ -4,16 +4,21 @@ set -eu
 
 conversionFolder=$(dirname "$0")
 configFolder=${conversionFolder}/../configFiles
-shutterOption=${2:-false}
-extraExclusions=${3:-",*-wa.json"}
+# Params:
+#   $1 = CCD_DEF_CASE_SERVICE_BASE_URL
+#   $2 = CCD_DEF_AAC_URL
+#   $3 = shutterOption (true|false), optional, defaults to false
+caseServiceUrl="${1-}"
+aacUrl="${2-}"
+shutterOption="${3:-false}"
+extraExclusions=${4:-",*-wa.json"}
 
 waEnabledVar=${PROBATE_WA_ENABLED:-false}
 if [ ${waEnabledVar} == true ]; then
   extraExclusions=""
 fi
 
-if [ -z "$1" ]
-  then
+if [ -z "$caseServiceUrl" ] || [ -z "$aacUrl" ]; then
     echo "Usage: ./ccdImports/conversionScripts/createAllXLS.sh CCD_DEF_CASE_SERVICE_BASE_URL CCD_DEF_AAC_URL"
     exit 1
 fi
@@ -27,11 +32,10 @@ else
 fi
 echo excludedFilenamePatterns = $excludedFilenamePatterns
 
-export CCD_DEF_CASE_SERVICE_BASE_URL=$1
-export CCD_DEF_AAC_URL=$2
-echo CCD_DEF_AAC_URL=$CCD_DEF_AAC_URL
+export CCD_DEF_CASE_SERVICE_BASE_URL="${caseServiceUrl}"
+export CCD_DEF_AAC_URL="${aacUrl}"
 
-echo using url = $CCD_DEF_CASE_SERVICE_BASE_URL
+echo using url = $CCD_DEF_CASE_SERVICE_BASE_URL,$CCD_DEF_AAC_URL
 
 ${conversionFolder}/convertJsonToXLS.sh ${configFolder}/CCD_Probate_Backoffice/ "${excludedFilenamePatterns}"
 ${conversionFolder}/convertJsonToXLS.sh ${configFolder}/CCD_Probate_Caveat/ "${excludedFilenamePatterns}"