1 files changed, 2 insertions, 0 deletions
diff --git a/security-utils/src/main/java/com/yahoo/security/tls/MutableX509KeyManager.java b/security-utils/src/main/java/com/yahoo/security/tls/MutableX509KeyManager.java
index e5e56f7a181..a63ca28c793 100644
--- a/security-utils/src/main/java/com/yahoo/security/tls/MutableX509KeyManager.java
+++ b/security-utils/src/main/java/com/yahoo/security/tls/MutableX509KeyManager.java
@@ -85,12 +85,14 @@ public class MutableX509KeyManager extends X509ExtendedKeyManager {
 
     @Override
     public X509Certificate[] getCertificateChain(String alias) {
+        if (alias == null) return null; // this method can be called with 'null' alias prior to any alias getter methods.
         return getThreadLocalManager()
                 .getCertificateChain(alias);
     }
 
     @Override
     public PrivateKey getPrivateKey(String alias) {
+        if (alias == null) return null; // this method can be called with 'null' alias prior to any alias getter methods.
         return getThreadLocalManager()
                 .getPrivateKey(alias);
     }