1 files changed, 5 insertions, 2 deletions
diff --git a/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java b/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java
index 844052e4b..80ad36c2d 100644
--- a/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java
+++ b/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java
@@ -1056,8 +1056,11 @@ public class KeyCertUtil {
         String dn = "ou=certificateRepository,ou=ca," + baseDN;
         BigInteger serialno = null;
         LDAPEntry entry = conn.read(dn);
-        String serialnoStr = (String) entry.getAttribute(
-                "serialno").getStringValues().nextElement();
+        LDAPAttribute serialNo = entry.getAttribute("serialno");
+        if (serialNo == null) {
+            throw new LDAPException("No value for attribute serial number in LDAP entry " + entry.getDN());
+        }
+        String serialnoStr = (String) serialNo.getStringValues().nextElement();
 
         serialno = BigIntegerMapper.BigIntegerFromDB(serialnoStr);
         LDAPAttribute attr = new LDAPAttribute("serialno");