1 files changed, 18 insertions, 9 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorModCLI.java b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorModCLI.java
index e098f5b98..f9de2ab98 100644
--- a/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorModCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorModCLI.java
@@ -1,5 +1,7 @@
 package com.netscape.cmstools.system;
 
+import java.util.Arrays;
+
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 
@@ -13,13 +15,15 @@ public class TPSConnectorModCLI extends CLI {
     public TPSConnectorModCLI(TPSConnectorCLI tpsConnectorCLI) {
         super("mod", "Modify TPS connector on TKS", tpsConnectorCLI);
         this.tpsConnectorCLI = tpsConnectorCLI;
+
+        createOptions();
     }
 
     public void printHelp() {
         formatter.printHelp(getFullName() + " <Connector ID> [OPTIONS...]", options);
     }
 
-    public void execute(String[] args) throws Exception {
+    public void createOptions() {
         Option option = new Option(null, "host", true, "TPS host");
         option.setArgName("host");
         options.addOption(option);
@@ -27,6 +31,15 @@ public class TPSConnectorModCLI extends CLI {
         option = new Option(null, "port", true, "TPS port");
         option.setArgName("port");
         options.addOption(option);
+    }
+
+    public void execute(String[] args) throws Exception {
+        // Always check for "--help" prior to parsing
+        if (Arrays.asList(args).contains("--help")) {
+            // Display usage
+            printHelp();
+            System.exit(0);
+        }
 
         CommandLine cmd = null;
 
@@ -36,19 +49,15 @@ public class TPSConnectorModCLI extends CLI {
         } catch (Exception e) {
             System.err.println("Error: " + e.getMessage());
             printHelp();
-            System.exit(1);
-        }
-
-        if (cmd.hasOption("help")) {
-            // Display usage
-            printHelp();
-            System.exit(0);
+            System.exit(-1);
         }
 
         String[] cmdArgs = cmd.getArgs();
+
         if (cmdArgs.length != 1) {
+            System.err.println("Error: No Connector ID specified.");
             printHelp();
-            System.exit(1);
+            System.exit(-1);
         }
 
         String connID = cmdArgs[0];