1 files changed, 3 insertions, 0 deletions
diff --git a/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java b/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java
index 6fbb2cfca..15fe408dd 100644
--- a/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java
+++ b/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java
@@ -71,6 +71,9 @@ public class X509CertImplMapper implements IDBAttrMapper {
 
     public void mapObjectToLDAPAttributeSet(IDBObj parent, String name,
             Object obj, LDAPAttributeSet attrs) throws EBaseException {
+        if (obj == null) {
+            throw new EBaseException(CMS.getUserMessage("CMS_DBS_SERIALIZE_FAILED", name));
+        }
         try {
             X509CertImpl cert = (X509CertImpl) obj;
             // make information searchable