diff --git a/examples/DisableObjectLegalHold.java b/examples/DisableObjectLegalHold.java
index 9da813bcd..fb0013f15 100644
--- a/examples/DisableObjectLegalHold.java
+++ b/examples/DisableObjectLegalHold.java
@@ -41,15 +41,18 @@ public static void main(String[] args)
               .object("my-objectname")
               .build());
 
-      // Check if the object legal hold is enabled or not.
-      System.out.println(
-          " Is object legal hold is enabled "
-              + minioClient.isObjectLegalHoldEnabled(
-                  IsObjectLegalHoldEnabledArgs.builder()
-                      .bucket("my-bucketname")
-                      .object("my-objectname")
-                      .versionId("object-versionId")
-                      .build()));
+      boolean status =
+          minioClient.isObjectLegalHoldEnabled(
+              IsObjectLegalHoldEnabledArgs.builder()
+                  .bucket("my-bucketname")
+                  .object("my-objectname")
+                  .build());
+
+      if (status) {
+        System.out.println("Legal hold is on");
+      } else {
+        System.out.println("Legal hold is off");
+      }
 
     } catch (MinioException e) {
       System.out.println("Error occurred: " + e);
diff --git a/examples/EnableObjectLegalHold.java b/examples/EnableObjectLegalHold.java
index 9fcf5a97d..6cbdb3146 100644
--- a/examples/EnableObjectLegalHold.java
+++ b/examples/EnableObjectLegalHold.java
@@ -42,15 +42,18 @@ public static void main(String[] args)
               .versionId("object-versionId")
               .build());
 
-      // Check if the object legal hold is enabled or not.
-      System.out.println(
-          " Is object legal hold is enabled "
-              + minioClient.isObjectLegalHoldEnabled(
-                  IsObjectLegalHoldEnabledArgs.builder()
-                      .bucket("my-bucketname")
-                      .object("my-objectname")
-                      .versionId("object-versionId")
-                      .build()));
+      boolean status =
+          minioClient.isObjectLegalHoldEnabled(
+              IsObjectLegalHoldEnabledArgs.builder()
+                  .bucket("my-bucketname")
+                  .object("my-objectname")
+                  .build());
+
+      if (status) {
+        System.out.println("Legal hold is on");
+      } else {
+        System.out.println("Legal hold is off");
+      }
 
     } catch (MinioException e) {
       System.out.println("Error occurred: " + e);
diff --git a/functional/FunctionalTest.java b/functional/FunctionalTest.java
index 24df2266b..d24338552 100644
--- a/functional/FunctionalTest.java
+++ b/functional/FunctionalTest.java
@@ -3520,8 +3520,9 @@ public static void composeObject_test6() throws Exception {
 
   /** Test: enableObjectLegalHold(EnableObjectLegalHoldArgs args) */
   public static void enableObjectLegalHold_test() throws Exception {
+    String methodName = "enableObjectLegalHold(EnableObjectLegalHoldArgs args)";
     if (!mintEnv) {
-      System.out.println("Test: enableObjectLegalHold(EnableObjectLegalHoldArgs args)");
+      System.out.println("Test: " + methodName);
     }
     long startTime = System.currentTimeMillis();
     String bucketName = getRandomName();
@@ -3542,38 +3543,22 @@ public static void enableObjectLegalHold_test() throws Exception {
         }
         client.disableObjectLegalHold(
             DisableObjectLegalHoldArgs.builder().bucket(bucketName).object(objectName).build());
-        mintSuccessLog("enableObjectLegalHold(EnableObjectLegalHoldArgs args)", null, startTime);
+        mintSuccessLog(methodName, null, startTime);
       } finally {
         client.removeObject(
             RemoveObjectArgs.builder().bucket(bucketName).object(objectName).build());
         client.removeBucket(RemoveBucketArgs.builder().bucket(bucketName).build());
       }
     } catch (Exception e) {
-      ErrorResponse errorResponse = null;
-      if (e instanceof ErrorResponseException) {
-        ErrorResponseException exp = (ErrorResponseException) e;
-        errorResponse = exp.errorResponse();
-      }
-
-      // Ignore NotImplemented error
-      if (errorResponse != null && errorResponse.errorCode() == ErrorCode.NOT_IMPLEMENTED) {
-        mintIgnoredLog("enableObjectLegalHold(EnableObjectLegalHoldArgs args)", null, startTime);
-      } else {
-        mintFailedLog(
-            "enableObjectLegalHold(EnableObjectLegalHoldArgs args)",
-            null,
-            startTime,
-            null,
-            e.toString() + " >>> " + Arrays.toString(e.getStackTrace()));
-        throw e;
-      }
+      handleException(methodName, null, startTime, e);
     }
   }
 
   /** Test: disableObjectLegalHold(DisableObjectLegalHoldArgs args) */
   public static void disableObjectLegalHold_test() throws Exception {
+    String methodName = "disableObjectLegalHold(DisableObjectLegalHoldArgs args)";
     if (!mintEnv) {
-      System.out.println("Test: disableObjectLegalHold(DisableObjectLegalHoldArgs args)");
+      System.out.println("Test: " + methodName);
     }
     long startTime = System.currentTimeMillis();
     String bucketName = getRandomName();
@@ -3597,26 +3582,9 @@ public static void disableObjectLegalHold_test() throws Exception {
             RemoveObjectArgs.builder().bucket(bucketName).object(objectName).build());
         client.removeBucket(RemoveBucketArgs.builder().bucket(bucketName).build());
       }
-      mintSuccessLog("disableObjectLegalHold(DisableObjectLegalHoldArgs args)", null, startTime);
+      mintSuccessLog(methodName, null, startTime);
     } catch (Exception e) {
-      ErrorResponse errorResponse = null;
-      if (e instanceof ErrorResponseException) {
-        ErrorResponseException exp = (ErrorResponseException) e;
-        errorResponse = exp.errorResponse();
-      }
-
-      // Ignore NotImplemented error
-      if (errorResponse != null && errorResponse.errorCode() == ErrorCode.NOT_IMPLEMENTED) {
-        mintIgnoredLog("disableObjectLegalHold(DisableObjectLegalHoldArgs args)", null, startTime);
-      } else {
-        mintFailedLog(
-            "disableObjectLegalHold(DisableObjectLegalHoldArgs args)",
-            null,
-            startTime,
-            null,
-            e.toString() + " >>> " + Arrays.toString(e.getStackTrace()));
-        throw e;
-      }
+      handleException(methodName, null, startTime, e);
     }
   }