1 files changed, 9 insertions, 4 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/key/KeyShowCLI.java b/base/java-tools/src/com/netscape/cmstools/key/KeyShowCLI.java
index a3d918e47..172f24934 100644
--- a/base/java-tools/src/com/netscape/cmstools/key/KeyShowCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/key/KeyShowCLI.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.ParseException;
 
@@ -40,6 +42,13 @@ public class KeyShowCLI extends CLI {
 
     public void execute(String[] args) {
 
+        // Check for "--help"
+        if (Arrays.asList(args).contains("--help")) {
+            // Display usage
+            printHelp();
+            System.exit(0);
+        }
+
         if (args.length != 1) {
             printHelp();
             System.exit(-1);
@@ -53,10 +62,6 @@ public class KeyShowCLI extends CLI {
             printHelp();
             System.exit(1);
         }
-        if (cmd.hasOption("help")) {
-            printHelp();
-            System.exit(1);
-        }
 
         KeyId keyId = new KeyId(args[0].trim());