diff --git a/api/src/main/java/io/minio/S3Base.java b/api/src/main/java/io/minio/S3Base.java
index 7ffda9d6a..aba3b0c9c 100644
--- a/api/src/main/java/io/minio/S3Base.java
+++ b/api/src/main/java/io/minio/S3Base.java
@@ -240,7 +240,7 @@ public void throwEncapsulatedException(ExecutionException e)
         | XmlParserException exc) {
       throw exc;
     } catch (Throwable exc) {
-      throw new RuntimeException(exc.getCause());
+      throw new RuntimeException(exc.getCause() == null ? exc : exc.getCause());
     }
   }
 
diff --git a/functional/FunctionalTest.java b/functional/FunctionalTest.java
index 0a2718064..1fc1b1d89 100644
--- a/functional/FunctionalTest.java
+++ b/functional/FunctionalTest.java
@@ -3849,10 +3849,8 @@ public static Process runMinio(boolean tls) throws Exception {
     env.put("MINIO_ROOT_USER", "minio");
     env.put("MINIO_ROOT_PASSWORD", "minio123");
     env.put("MINIO_CI_CD", "1");
-    env.put("MINIO_KMS_KES_ENDPOINT", "https://play.min.io:7373");
-    env.put("MINIO_KMS_KES_KEY_FILE", "play.min.io.kes.root.key");
-    env.put("MINIO_KMS_KES_CERT_FILE", "play.min.io.kes.root.cert");
-    env.put("MINIO_KMS_KES_KEY_NAME", "my-minio-key");
+    // echo -n abcdefghijklmnopqrstuvwxyzABCDEF | base64 -
+    env.put("MINIO_KMS_SECRET_KEY", "my-minio-key:YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQkNERUY=");
     env.put("MINIO_NOTIFY_WEBHOOK_ENABLE_miniojavatest", "on");
     env.put("MINIO_NOTIFY_WEBHOOK_ENDPOINT_miniojavatest", "http://example.org/");
     sqsArn = "arn:minio:sqs::miniojavatest:webhook";