1 files changed, 3 insertions, 2 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java b/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java
index 4e9d0c8ab..f4511b93b 100644
--- a/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java
@@ -316,12 +316,13 @@ public class MainCLI extends CLI {
 
         if (cmd.hasOption("version")) {
             printVersion();
-            System.exit(1);
+            System.exit(0);
         }
 
         if (cmdArgs.length == 0 || cmd.hasOption("help")) {
+            // Print 'pki' usage
             printHelp();
-            System.exit(1);
+            System.exit(0);
         }
 
         parseOptions(cmd);