1 files changed, 15 insertions, 18 deletions
diff --git a/base/common/src/com/netscape/certsrv/base/PKIException.java b/base/common/src/com/netscape/certsrv/base/PKIException.java
index f89c1b18c..ae557d465 100644
--- a/base/common/src/com/netscape/certsrv/base/PKIException.java
+++ b/base/common/src/com/netscape/certsrv/base/PKIException.java
@@ -31,44 +31,41 @@ public class PKIException extends RuntimeException {
 
     public int code;
 
+    public PKIException(int code, String message, Throwable cause) {
+        super(message, cause);
+        this.code = code;
+    }
+
     public PKIException(Response.Status status) {
-        super(status.getReasonPhrase());
-        code = status.getStatusCode();
+        this(status, status.getReasonPhrase(), null);
     }
 
     public PKIException(String message) {
-        super(message);
-        code = Response.Status.INTERNAL_SERVER_ERROR.getStatusCode();
+        this(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), message, null);
     }
 
     public PKIException(int code, String message) {
-        super(message);
-        this.code = code;
+        this(code, message, null);
     }
 
     public PKIException(Response.Status status, String message) {
-        super(message);
-        code = status.getStatusCode();
+        this(status.getStatusCode(), message, null);
     }
 
-    public PKIException(String message, Throwable cause) {
-        super(message, cause);
-        code = Response.Status.INTERNAL_SERVER_ERROR.getStatusCode();
+    public PKIException(Throwable cause) {
+        this(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), cause.getMessage(), cause);
     }
 
-    public PKIException(int code, String message, Throwable cause) {
-        super(message, cause);
-        this.code = code;
+    public PKIException(String message, Throwable cause) {
+        this(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), message, cause);
     }
 
     public PKIException(Response.Status status, String message, Throwable cause) {
-        super(message, cause);
-        code = status.getStatusCode();
+        this(status.getStatusCode(), message, cause);
     }
 
     public PKIException(Data data) {
-        super(data.message);
-        code = data.code;
+        this(data.code, data.message, null);
     }
 
     public int getCode() {