diff --git a/docker/test/performance-comparison/compare.sh b/docker/test/performance-comparison/compare.sh
index c436a725350..4507de16492 100755
--- a/docker/test/performance-comparison/compare.sh
+++ b/docker/test/performance-comparison/compare.sh
@@ -760,7 +760,7 @@ create view test_times_view as
         total_client_time,
         queries,
         query_max,
-        real / queries avg_real_per_query,
+        real / if(queries > 0, queries, 1) avg_real_per_query,
         query_min,
         runs
     from test_time
@@ -781,7 +781,7 @@ create view test_times_view_total as
         sum(total_client_time),
         sum(queries),
         max(query_max),
-        sum(real) / sum(queries) avg_real_per_query,
+        sum(real) / if(sum(queries) > 0, sum(queries), 1) avg_real_per_query,
         min(query_min),
         -- Totaling the number of runs doesn't make sense, but use the max so
         -- that the reporting script doesn't complain about queries being too
diff --git a/docker/test/performance-comparison/perf.py b/docker/test/performance-comparison/perf.py
index f1c5df146aa..3ddaf99b879 100755
--- a/docker/test/performance-comparison/perf.py
+++ b/docker/test/performance-comparison/perf.py
@@ -263,8 +263,17 @@ for query_index in queries_to_run:
     for conn_index, c in enumerate(all_connections):
         try:
             prewarm_id = f'{query_prefix}.prewarm0'
-            # Will also detect too long queries during warmup stage
-            res = c.execute(q, query_id = prewarm_id, settings = {'max_execution_time': 10})
+
+            try:
+                # Will also detect too long queries during warmup stage
+                res = c.execute(q, query_id = prewarm_id, settings = {'max_execution_time': 10})
+            except clickhouse_driver.errors.Error as e:
+                # Add query id to the exception to make debugging easier.
+                e.args = (prewarm_id, *e.args)
+                e.message = prewarm_id + ': ' + e.message
+                raise
+
+
             print(f'prewarm\t{query_index}\t{prewarm_id}\t{conn_index}\t{c.last_query.elapsed}')
         except KeyboardInterrupt:
             raise
@@ -312,7 +321,7 @@ for query_index in queries_to_run:
         for conn_index, c in enumerate(this_query_connections):
             try:
                 res = c.execute(q, query_id = run_id)
-            except Exception as e:
+            except clickhouse_driver.errors.Error as e:
                 # Add query id to the exception to make debugging easier.
                 e.args = (run_id, *e.args)
                 e.message = run_id + ': ' + e.message
@@ -389,7 +398,7 @@ for query_index in queries_to_run:
             try:
                 res = c.execute(q, query_id = run_id, settings = {'query_profiler_real_time_period_ns': 10000000})
                 print(f'profile\t{query_index}\t{run_id}\t{conn_index}\t{c.last_query.elapsed}')
-            except Exception as e:
+            except clickhouse_driver.errors.Error as e:
                 # Add query id to the exception to make debugging easier.
                 e.args = (run_id, *e.args)
                 e.message = run_id + ': ' + e.message