1 files changed, 9 insertions, 2 deletions
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/utils/AbstractCredentialProvider.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/utils/AbstractCredentialProvider.java
index 6477d8ff..cd77228c 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/utils/AbstractCredentialProvider.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/utils/AbstractCredentialProvider.java
@@ -73,7 +73,13 @@ public abstract class AbstractCredentialProvider implements IPvp2CredentialProvi
    * @return keyStore friendlyName
    */
   public final String getFriendlyName() {
-    return getBasicKeyStoreConfig().getFriendlyName();
+    try {
+      return getBasicKeyStoreConfig().getFriendlyName();
+      
+    } catch (EaafConfigurationException e) {
+      return "No KeyStoreName";
+      
+    }
 
   }
 
@@ -81,9 +87,10 @@ public abstract class AbstractCredentialProvider implements IPvp2CredentialProvi
    * Get the basic KeyStore configuration object for this SAML2 credential.
    *
    * @return KeyStore configuration object
+   * @throws EaafConfigurationException  In case of a configuration error
    */
   @Nonnull
-  public abstract KeyStoreConfiguration getBasicKeyStoreConfig();
+  public abstract KeyStoreConfiguration getBasicKeyStoreConfig() throws EaafConfigurationException;
 
   /**
    * Get alias of key for metadata signing.