Merge branch 'rightlib' into mergelibs-241120-1113

1 files changed, 8 insertions, 7 deletions

diff --git a/contrib/python/clickhouse-connect/clickhouse_connect/driver/transform.py b/contrib/python/clickhouse-connect/clickhouse_connect/driver/transform.py
index 1d20d9c6e7..34ec1b7f4d 100644
--- a/contrib/python/clickhouse-connect/clickhouse_connect/driver/transform.py
+++ b/contrib/python/clickhouse-connect/clickhouse_connect/driver/transform.py
@@ -54,13 +54,14 @@ class NativeTransform:
                 if isinstance(ex, StreamCompleteException):
                     # We ran out of data before it was expected, this could be ClickHouse reporting an error
                     # in the response
-                    message = source.last_message
-                    if len(message) > 1024:
-                        message = message[-1024:]
-                    error_start = message.find('Code: ')
-                    if error_start != -1:
-                        message = message[error_start:]
-                    raise StreamFailureError(message) from None
+                    if source.last_message:
+                        message = source.last_message
+                        if len(message) > 1024:
+                            message = message[-1024:]
+                        error_start = message.find('Code: ')
+                        if error_start != -1:
+                            message = message[error_start:]
+                        raise StreamFailureError(message) from None
                 raise
             block_num += 1
             return result_block