diff --git a/examples/bun-mysql2/src/db/query_sql.ts b/examples/bun-mysql2/src/db/query_sql.ts
index 1673007..a566596 100644
--- a/examples/bun-mysql2/src/db/query_sql.ts
+++ b/examples/bun-mysql2/src/db/query_sql.ts
@@ -28,6 +28,9 @@ export async function getAuthor(client: Client, args: GetAuthorArgs): Promise<Ge
         return null;
     }
     const row = rows[0];
+    if (!row) {
+        return null;
+    }
     return {
         id: row[0],
         name: row[1],
@@ -168,6 +171,9 @@ export async function test(client: Client): Promise<TestRow | null> {
         return null;
     }
     const row = rows[0];
+    if (!row) {
+        return null;
+    }
     return {
         cBit: row[0],
         cTinyint: row[1],
diff --git a/examples/node-mysql2/src/db/query_sql.ts b/examples/node-mysql2/src/db/query_sql.ts
index c79988f..bbfcd2b 100644
--- a/examples/node-mysql2/src/db/query_sql.ts
+++ b/examples/node-mysql2/src/db/query_sql.ts
@@ -28,6 +28,9 @@ export async function getAuthor(client: Client, args: GetAuthorArgs): Promise<Ge
         return null;
     }
     const row = rows[0];
+    if (!row) {
+        return null;
+    }
     return {
         id: row[0],
         name: row[1],
@@ -168,6 +171,9 @@ export async function test(client: Client): Promise<TestRow | null> {
         return null;
     }
     const row = rows[0];
+    if (!row) {
+        return null;
+    }
     return {
         cBit: row[0],
         cTinyint: row[1],
diff --git a/src/drivers/mysql2.ts b/src/drivers/mysql2.ts
index 7859ade..35902f6 100644
--- a/src/drivers/mysql2.ts
+++ b/src/drivers/mysql2.ts
@@ -627,6 +627,17 @@ export class Driver {
                 NodeFlags.TypeExcludesFlags
             )
           ),
+	  factory.createIfStatement(
+            factory.createPrefixUnaryExpression(
+              SyntaxKind.ExclamationToken,
+              factory.createIdentifier("row")
+            ),
+            factory.createBlock(
+              [factory.createReturnStatement(factory.createNull())],
+              true
+            ),
+            undefined
+          ),
           factory.createReturnStatement(
             factory.createObjectLiteralExpression(
               columns.map((col, i) =>