1 files changed, 10 insertions, 1 deletions
diff --git a/base/server/cms/src/com/netscape/cms/profile/def/EnrollDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/EnrollDefault.java
index 5c2029a0f..8a6fa4cef 100644
--- a/base/server/cms/src/com/netscape/cms/profile/def/EnrollDefault.java
+++ b/base/server/cms/src/com/netscape/cms/profile/def/EnrollDefault.java
@@ -259,7 +259,11 @@ public abstract class EnrollDefault implements IPolicyDefault, ICertInfoPolicyDe
 
         setValue(name, locale, info, value);
 
-        request.setExtData(IEnrollProfile.REQUEST_CERTINFO, info);
+        boolean ret = request.setExtData(IEnrollProfile.REQUEST_CERTINFO, info);
+        if (ret == false) {
+            CMS.debug("EnrollDefault: setValue(): request.setExtData() returned false");
+            throw new EPropertyException("EnrollDefault: setValue(): request.setExtData() failed");
+        }
     }
 
     /**
@@ -328,6 +332,11 @@ public abstract class EnrollDefault implements IPolicyDefault, ICertInfoPolicyDe
     protected Extension getExtension(String name, X509CertInfo info) {
         CertificateExtensions exts = null;
 
+        if (info == null) {
+            CMS.debug("EnrollDefault: getExtension(), info == null");
+            return null;
+        }
+
         try {
             exts = (CertificateExtensions)
                     info.get(X509CertInfo.EXTENSIONS);