1 files changed, 9 insertions, 5 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/key/KeyModifyCLI.java b/base/java-tools/src/com/netscape/cmstools/key/KeyModifyCLI.java
index 483cc23ab..437808084 100644
--- a/base/java-tools/src/com/netscape/cmstools/key/KeyModifyCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/key/KeyModifyCLI.java
@@ -18,6 +18,8 @@
 
 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;
@@ -40,6 +42,13 @@ public class KeyModifyCLI 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, "status", true, "Status of the key.\nValid values: active, inactive");
         option.setRequired(true);
         option.setArgName("status");
@@ -55,11 +64,6 @@ public class KeyModifyCLI extends CLI {
             System.exit(1);
         }
 
-        if (cmd.hasOption("help")) {
-            printHelp();
-            System.exit(1);
-        }
-
         String status = cmd.getOptionValue("status");
         if (status == null) {
             System.out.println("No status:: " + status);