diff --git a/src/main/java/com/google/cloud/spanner/jdbc/JdbcSqlExceptionFactory.java b/src/main/java/com/google/cloud/spanner/jdbc/JdbcSqlExceptionFactory.java
index a6fc2bfa..b7d1130d 100644
--- a/src/main/java/com/google/cloud/spanner/jdbc/JdbcSqlExceptionFactory.java
+++ b/src/main/java/com/google/cloud/spanner/jdbc/JdbcSqlExceptionFactory.java
@@ -68,6 +68,10 @@ public static class JdbcSqlTimeoutException extends SQLTimeoutException
       implements JdbcSqlException {
     private static final long serialVersionUID = 2363793358642102814L;
 
+    private JdbcSqlTimeoutException(SpannerException e) {
+      super(e.getMessage(), "Timed out", Code.DEADLINE_EXCEEDED_VALUE, e);
+    }
+
     private JdbcSqlTimeoutException(String message) {
       super(message, "Timed out", Code.DEADLINE_EXCEEDED_VALUE);
     }
@@ -188,7 +192,7 @@ static SQLException of(SpannerException e) {
           return new JdbcAbortedException((AbortedException) e);
         }
       case DEADLINE_EXCEEDED:
-        return new JdbcSqlTimeoutException(e.getMessage());
+        return new JdbcSqlTimeoutException(e);
       case ALREADY_EXISTS:
       case CANCELLED:
       case DATA_LOSS: