1 files changed, 6 insertions, 1 deletions
diff --git a/base/common/src/com/netscape/cms/client/user/UserCLI.java b/base/common/src/com/netscape/cms/client/user/UserCLI.java
index 0e18d0692..a5104135b 100644
--- a/base/common/src/com/netscape/cms/client/user/UserCLI.java
+++ b/base/common/src/com/netscape/cms/client/user/UserCLI.java
@@ -75,9 +75,14 @@ public class UserCLI extends CLI {
 
     public void execute(String[] args) throws Exception {
 
-        client = new UserRestClient(parent.url + "/pki", parent.certNickname);
+        client = new UserRestClient(parent.config);
         client.setVerbose(verbose);
 
+        if (args.length == 0) {
+            printHelp();
+            System.exit(1);
+        }
+
         String command = args[0];
         String[] commandArgs = Arrays.copyOfRange(args, 1, args.length);