diff --git a/files/commonTemplates/service-instance.yaml b/files/commonTemplates/service-instance.yaml
index 216657b..0c525c2 100644
--- a/files/commonTemplates/service-instance.yaml
+++ b/files/commonTemplates/service-instance.yaml
@@ -38,7 +38,7 @@ spec:
 
   {{- if or $serviceSpec.parameters $serviceSpec.jsonParameters }}
   {{- $parameters := $serviceSpec.parameters | default (dict) }}
-  {{- if and (eq $serviceSpec.serviceOfferingName "xsuaa") (or (not (get (get $parameters "oauth2-configuration") "redirect-uris")) (eq (len (get (get $parameters "oauth2-configuration") "redirect-uris")) 0)) }}
+  {{- if and (eq $serviceSpec.serviceOfferingName "xsuaa") (or (not (get (get $parameters "oauth2-configuration" | default (dict)) "redirect-uris")) (eq (len (get (get $parameters "oauth2-configuration" | default (dict)) "redirect-uris")) 0)) }}
     {{- $redirectUris := include "redirectUris" $ | fromJson }}
     {{- $oauth2Cfg := merge ($redirectUris) (get $parameters "oauth2-configuration" | default dict) }}
     {{- $_ := set $parameters "oauth2-configuration" $oauth2Cfg }}