diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/idp/NonSnarlIdpMetadataManager.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/idp/NonSnarlIdpMetadataManager.java
index aa0d4c302d5..9d5f9993d1d 100644
--- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/idp/NonSnarlIdpMetadataManager.java
+++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/idp/NonSnarlIdpMetadataManager.java
@@ -213,7 +213,7 @@ protected String getSpName(ExtendedMetadataDelegate provider) throws MetadataPro
     protected String getHostedSpName(ExtendedMetadataDelegate provider) throws MetadataProviderException {
         String key = getSpName(provider);
         ExtendedMetadata extendedMetadata = getExtendedMetadata(key, provider);
-        if (extendedMetadata.isLocal()) {
+        if (extendedMetadata != null && extendedMetadata.isLocal()) {
             return key;
         } else {
             return null;