1 files changed, 3 insertions, 0 deletions
diff --git a/base/common/src/com/netscape/cmscore/security/CertificateInfo.java b/base/common/src/com/netscape/cmscore/security/CertificateInfo.java
index 914803223..040abc3c2 100644
--- a/base/common/src/com/netscape/cmscore/security/CertificateInfo.java
+++ b/base/common/src/com/netscape/cmscore/security/CertificateInfo.java
@@ -189,6 +189,9 @@ public abstract class CertificateInfo {
                 String hashtype = (String) mProperties.get(ConfigConstants.PR_HASH_TYPE);
 
                 algm = KeyCertUtil.getSigningAlgorithm(getKeyAlgorithm(), hashtype);
+                if (algm == null) {
+                    throw new NoSuchAlgorithmException();
+                }
                 mProperties.put(Constants.PR_SIGNATURE_ALGORITHM, algm);
             }