diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
index 1daed52c..89d4f8f3 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml
@@ -1,5 +1,5 @@
 {{- if and (eq .Values.mas_app_id "manage") (.Values.run_sanity_test) }}
-{{- if .Values.mas_appws_spec.components.icd }}
+{{- if and (.Values.mas_appws_spec.components) (.Values.mas_appws_spec.components.icd) }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env
diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
index 983f50d7..6dea61af 100644
--- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
+++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml
@@ -1,5 +1,5 @@
 {{- if eq .Values.mas_app_id "manage" }}
-{{- if .Values.mas_appws_spec.components.icd }}
+{{- if and (.Values.mas_appws_spec.components) (.Values.mas_appws_spec.components.icd) }}
 
 # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources 
 # in the application. This type of test should only be run in a downstream environment such as a dev or staging env