2 files changed, 8 insertions, 3 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 186c9827e..e7097e8ca 100644
--- a/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java
@@ -489,7 +489,7 @@ public class MainCLI extends CLI {
             System.out.println();
         }
 
-        // Do not call CryptoManager.initialize() on client-init
+        // Do not call CryptoManager.initialize() on client-init and client-cert-import
         // because otherwise the database will be locked.
         String command = cmdArgs[0];
         if (!command.equals("client-init") && !command.equals("client-cert-import")) {
diff --git a/base/java-tools/src/com/netscape/cmstools/client/ClientCertImportCLI.java b/base/java-tools/src/com/netscape/cmstools/client/ClientCertImportCLI.java
index e5b07b3e8..90e3d0a3e 100644
--- a/base/java-tools/src/com/netscape/cmstools/client/ClientCertImportCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/client/ClientCertImportCLI.java
@@ -87,8 +87,6 @@ public class ClientCertImportCLI extends CLI {
             System.exit(-1);
         }
 
-        client = parent.getClient();
-
         byte[] bytes = null;
 
         String certPath = cmd.getOptionValue("cert");
@@ -110,7 +108,14 @@ public class ClientCertImportCLI extends CLI {
             isCACert = true;
 
         } else if (importFromCAServer) {
+
+            // late initialization
+            MainCLI mainCLI = (MainCLI)parent.parent;
+            mainCLI.init();
+
+            client = mainCLI.getClient();
             ClientConfig config = client.getConfig();
+
             String caServerURI = "http://" + config.getServerURI().getHost() + ":8080/ca";
 
             if (verbose) System.out.println("Downloading CA certificate from " + caServerURI + ".");