diff --git a/security/jss/org/mozilla/jss/pkix/crmf/CertRequest.java b/security/jss/org/mozilla/jss/pkix/crmf/CertRequest.java
index 43c7e11ac59a..fff7cba0d06a 100644
--- a/security/jss/org/mozilla/jss/pkix/crmf/CertRequest.java
+++ b/security/jss/org/mozilla/jss/pkix/crmf/CertRequest.java
@@ -53,13 +53,20 @@ public class CertRequest implements ASN1Value {
     private CertRequest() { }
 
     /**
-     * Private constructor for the Template class.
+     * @param certReqId May NOT be null.
+     * @param certTemplate May NOT be null.
      * @param controls May be null.
      */
-    CertRequest(INTEGER certReqId, CertTemplate certTemplate,
+    public CertRequest(INTEGER certReqId, CertTemplate certTemplate,
             SEQUENCE controls)
     {
+        if( certReqId == null ) {
+            throw new NullPointerException("certReqId is null");
+        }
         this.certReqId = certReqId;
+        if( certTemplate == null ) {
+            throw new NullPointerException("certTemplate is null");
+        }
         this.certTemplate = certTemplate;
         this.controls = controls;
     }
diff --git a/security/jss/org/mozilla/jss/pkix/crmf/CertTemplate.java b/security/jss/org/mozilla/jss/pkix/crmf/CertTemplate.java
index 6325fefe8081..7e00d7d8affe 100644
--- a/security/jss/org/mozilla/jss/pkix/crmf/CertTemplate.java
+++ b/security/jss/org/mozilla/jss/pkix/crmf/CertTemplate.java
@@ -62,7 +62,11 @@ public class CertTemplate implements ASN1Value {
     private BIT_STRING subjectUID;
     private SEQUENCE extensions;
 
-    CertTemplate() { }
+    /**
+     * Creates an empty CertTemplate. Use the accessor methods to fill it
+     * up with stuff.
+     */
+    public CertTemplate() { }
 
     /**
      * Returns true if the version field is present.