2 files changed, 4 insertions, 3 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/cli/CLI.java b/base/java-tools/src/com/netscape/cmstools/cli/CLI.java
index 113c5e040..4911b8ae2 100644
--- a/base/java-tools/src/com/netscape/cmstools/cli/CLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cli/CLI.java
@@ -190,10 +190,11 @@ public class CLI {
     }
 
     public PKIClient getClient() throws Exception {
-        return client;
+        if (parent != null) return parent.getClient();
+        return null;
     }
 
-    public Object getClient(String name) {
+    public Object getClient(String name) throws Exception {
         if (parent != null) return parent.getClient(name);
         return null;
     }
diff --git a/base/java-tools/src/com/netscape/cmstools/cli/ProxyCLI.java b/base/java-tools/src/com/netscape/cmstools/cli/ProxyCLI.java
index 1cf6feaf2..60d4593d4 100644
--- a/base/java-tools/src/com/netscape/cmstools/cli/ProxyCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cli/ProxyCLI.java
@@ -91,7 +91,7 @@ public class ProxyCLI extends CLI {
         return module.getClient();
     }
 
-    public Object getClient(String name) {
+    public Object getClient(String name) throws Exception {
         return module.getClient(name);
     }