1 files changed, 1 insertions, 0 deletions
diff --git a/base/common/src/com/netscape/certsrv/key/KeyRequestInfo.java b/base/common/src/com/netscape/certsrv/key/KeyRequestInfo.java
index d9e5fbf1c..45f8b1335 100644
--- a/base/common/src/com/netscape/certsrv/key/KeyRequestInfo.java
+++ b/base/common/src/com/netscape/certsrv/key/KeyRequestInfo.java
@@ -55,6 +55,7 @@ public class KeyRequestInfo extends CMSRequestInfo {
      * @return the key ID in the keyURL
      */
     public KeyId getKeyId() {
+        if (keyURL == null) return null;
         String id = keyURL.substring(keyURL.lastIndexOf("/") + 1);
         return new KeyId(id);
     }