diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSqlAction.java b/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSqlAction.java index 880a0231dd..10d9dab0fa 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSqlAction.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSqlAction.java @@ -35,6 +35,7 @@ import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestStatus; import org.opensearch.sql.common.antlr.SyntaxCheckException; +import org.opensearch.sql.exception.ExpressionEvaluationException; import org.opensearch.sql.exception.SemanticCheckException; import org.opensearch.sql.legacy.antlr.OpenSearchLegacySqlAnalyzer; import org.opensearch.sql.legacy.antlr.SqlAnalysisConfig; @@ -244,7 +245,8 @@ private static boolean isClientError(Exception e) { || e instanceof VerificationException || e instanceof SqlAnalysisException || e instanceof SyntaxCheckException - || e instanceof SemanticCheckException; + || e instanceof SemanticCheckException + || e instanceof ExpressionEvaluationException; } private void sendResponse(final RestChannel channel, final String message, final RestStatus status) {