1 files changed, 8 insertions, 0 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserCertAddCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserCertAddCLI.java
index 1a1ce5ee0..4ee1f0dfc 100644
--- a/base/java-tools/src/com/netscape/cmstools/user/UserCertAddCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/user/UserCertAddCLI.java
@@ -19,6 +19,7 @@
 package com.netscape.cmstools.user;
 
 import java.io.File;
+import java.util.Arrays;
 import java.util.Scanner;
 
 import org.apache.commons.cli.CommandLine;
@@ -46,6 +47,13 @@ public class UserCertAddCLI extends CLI {
 
     public void execute(String[] args) throws Exception {
 
+        // 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, "input", true, "Input file");
         option.setArgName("file");
         option.setRequired(true);