diff --git a/src/client/broker/broker-client.ts b/src/client/broker/broker-client.ts
index 8615e90..b453699 100644
--- a/src/client/broker/broker-client.ts
+++ b/src/client/broker/broker-client.ts
@@ -65,7 +65,7 @@ export class PinotClient implements IPinotClient {
           first: response.resultTable?.rows?.slice(0, 3),
           last: response.resultTable?.rows?.slice(-3),
           sql,
-          queryOptions: PinotClient.toQueryOptions(options),
+          queryOptions,
         },
       });
     }
diff --git a/src/client/broker/transport/json/undici.ts b/src/client/broker/transport/json/undici.ts
index 58959bf..9dcce19 100644
--- a/src/client/broker/transport/json/undici.ts
+++ b/src/client/broker/transport/json/undici.ts
@@ -52,6 +52,7 @@ export class PinotBrokerJSONTransport implements IPinotBrokerTransport {
 
     const response = await this.pool.request(reqOptions).catch((err: Error) => {
       throw new PinotError({
+        data: { body },
         message: `Pinot transport error: ${err.message}`,
         type: EPinotErrorType.TRANSPORT,
         cause: err,