diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/CursorIT.java b/integ-test/src/test/java/org/opensearch/sql/legacy/CursorIT.java
index 2bcb2902a2..e4ba593844 100644
--- a/integ-test/src/test/java/org/opensearch/sql/legacy/CursorIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/legacy/CursorIT.java
@@ -393,7 +393,7 @@ public void invalidCursorIdNotDecodable() throws IOException {
 
     JSONObject resp = new JSONObject(TestUtils.getResponseBody(response));
     assertThat(resp.getInt("status"), equalTo(400));
-    assertThat(resp.query("/error/type"), equalTo("illegal_argument_exception"));
+    assertThat(resp.query("/error/type"), equalTo("IllegalArgumentException"));
   }
 
   /**
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/OpenSearchErrorMessage.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/OpenSearchErrorMessage.java
index 8117d241b1..09c09919ec 100644
--- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/OpenSearchErrorMessage.java
+++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/OpenSearchErrorMessage.java
@@ -12,8 +12,8 @@
 
 public class OpenSearchErrorMessage extends ErrorMessage<OpenSearchException> {
 
-  OpenSearchErrorMessage(OpenSearchException exception, int status) {
-    super(exception, status);
+  OpenSearchErrorMessage(OpenSearchException exception, int defaultStatus) {
+    super(exception, exception.status() != null ? exception.status().getStatus() : defaultStatus);
   }
 
   @Override
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/error/OpenSearchErrorMessage.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/error/OpenSearchErrorMessage.java
index 87a374d353..a712ceaedf 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/response/error/OpenSearchErrorMessage.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/response/error/OpenSearchErrorMessage.java
@@ -13,8 +13,8 @@
 /** OpenSearch Error Message. */
 public class OpenSearchErrorMessage extends ErrorMessage {
 
-  OpenSearchErrorMessage(OpenSearchException exception, int status) {
-    super(exception, status);
+  OpenSearchErrorMessage(OpenSearchException exception, int defaultStatus) {
+    super(exception, exception.status() != null ? exception.status().getStatus() : defaultStatus);
   }
 
   @Override