1 files changed, 10 insertions, 5 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/key/KeyRequestReviewCLI.java b/base/java-tools/src/com/netscape/cmstools/key/KeyRequestReviewCLI.java
index bf17fb21e..5464625fc 100644
--- a/base/java-tools/src/com/netscape/cmstools/key/KeyRequestReviewCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/key/KeyRequestReviewCLI.java
@@ -1,5 +1,7 @@
 package com.netscape.cmstools.key;
 
+import java.util.Arrays;
+
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.ParseException;
@@ -22,6 +24,14 @@ public class KeyRequestReviewCLI extends CLI {
     }
 
     public void execute(String[] args) {
+
+        // Check for "--help" prior to parsing due to required option
+        if (Arrays.asList(args).contains("--help")) {
+            // Display usage
+            printHelp();
+            System.exit(0);
+        }
+
         Option option = new Option(null, "action", true,
                 "Action to be performed on the request.\nValid values: approve, reject, cancel.");
         option.setArgName("Action to perform");
@@ -38,11 +48,6 @@ public class KeyRequestReviewCLI extends CLI {
             System.exit(1);
         }
 
-        if (cmd.hasOption("help")) {
-            printHelp();
-            System.exit(1);
-        }
-
         String[] cmdArgs = cmd.getArgs();
         if (cmdArgs.length != 1) {
             System.err.println("Error: Invalid arguments provided.");