diff --git a/client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoStatement.java b/client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoStatement.java
index 95cd63729fae..62f1470c341a 100644
--- a/client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoStatement.java
+++ b/client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoStatement.java
@@ -284,7 +284,7 @@ final boolean internalExecute(String sql)
             throw new SQLException(e.getMessage(), e);
         }
         catch (RuntimeException e) {
-            throw new SQLException("Error executing query", e);
+            throw new SQLException("Error executing query: " + e.getMessage(), e);
         }
         finally {
             executingClient.set(null);
diff --git a/service/trino-verifier/src/main/java/io/trino/verifier/Validator.java b/service/trino-verifier/src/main/java/io/trino/verifier/Validator.java
index 1d87bf80e829..c3880b2e7364 100644
--- a/service/trino-verifier/src/main/java/io/trino/verifier/Validator.java
+++ b/service/trino-verifier/src/main/java/io/trino/verifier/Validator.java
@@ -545,7 +545,7 @@ private QueryResult executeQuery(String url, String username, String password, Q
         }
         catch (SQLException e) {
             Exception exception = e;
-            if (("Error executing query".equals(e.getMessage()) || "Error fetching results".equals(e.getMessage())) &&
+            if ((e.getMessage().startsWith("Error executing query") || "Error fetching results".equals(e.getMessage())) &&
                     (e.getCause() instanceof Exception)) {
                 exception = (Exception) e.getCause();
             }