diff --git a/examples/bun-postgres/src/db/query_sql.ts b/examples/bun-postgres/src/db/query_sql.ts
index fc99497..87e1dce 100644
--- a/examples/bun-postgres/src/db/query_sql.ts
+++ b/examples/bun-postgres/src/db/query_sql.ts
@@ -20,6 +20,9 @@ export async function getAuthor(sql: Sql, args: GetAuthorArgs): Promise<GetAutho
         return null;
     }
     const row = rows[0];
+    if (!row) {
+        return null;
+    }
     return {
         id: row[0],
         name: row[1],
@@ -70,6 +73,9 @@ export async function createAuthor(sql: Sql, args: CreateAuthorArgs): Promise<Cr
         return null;
     }
     const row = rows[0];
+    if (!row) {
+        return null;
+    }
     return {
         id: row[0],
         name: row[1],
diff --git a/examples/node-postgres/src/db/query_sql.ts b/examples/node-postgres/src/db/query_sql.ts
index fc99497..87e1dce 100644
--- a/examples/node-postgres/src/db/query_sql.ts
+++ b/examples/node-postgres/src/db/query_sql.ts
@@ -20,6 +20,9 @@ export async function getAuthor(sql: Sql, args: GetAuthorArgs): Promise<GetAutho
         return null;
     }
     const row = rows[0];
+    if (!row) {
+        return null;
+    }
     return {
         id: row[0],
         name: row[1],
@@ -70,6 +73,9 @@ export async function createAuthor(sql: Sql, args: CreateAuthorArgs): Promise<Cr
         return null;
     }
     const row = rows[0];
+    if (!row) {
+        return null;
+    }
     return {
         id: row[0],
         name: row[1],
diff --git a/src/drivers/postgres.ts b/src/drivers/postgres.ts
index 44c4a47..1a2b575 100644
--- a/src/drivers/postgres.ts
+++ b/src/drivers/postgres.ts
@@ -417,13 +417,13 @@ export function manyDecl(
                         ),
                       ]
                     ),
-                    factory.createIdentifier("values"),
+                    factory.createIdentifier("values")
                   ),
                   undefined,
-                  undefined,
+                  undefined
                 )
               ),
-              factory.createIdentifier("map"),
+              factory.createIdentifier("map")
             ),
             undefined,
             [
@@ -431,7 +431,11 @@ export function manyDecl(
                 undefined,
                 undefined,
                 [
-                  factory.createParameterDeclaration(undefined, undefined, "row"),
+                  factory.createParameterDeclaration(
+                    undefined,
+                    undefined,
+                    "row"
+                  ),
                 ],
                 undefined,
                 factory.createToken(SyntaxKind.EqualsGreaterThanToken),
@@ -510,7 +514,9 @@ export function oneDecl(
                             params.map((param, i) =>
                               factory.createPropertyAccessExpression(
                                 factory.createIdentifier("args"),
-                                factory.createIdentifier(argName(i, param.column))
+                                factory.createIdentifier(
+                                  argName(i, param.column)
+                                )
                               )
                             ),
                             false
@@ -520,7 +526,7 @@ export function oneDecl(
                       factory.createIdentifier("values")
                     ),
                     undefined,
-                    undefined,
+                    undefined
                   )
                 )
               ),
@@ -550,12 +556,31 @@ export function oneDecl(
         ),
         factory.createVariableStatement(
           undefined,
-          factory.createVariableDeclarationList([
-            factory.createVariableDeclaration("row", undefined, undefined, factory.createElementAccessExpression(
-              factory.createIdentifier("rows"),
-              factory.createNumericLiteral("0")
-            )),
-          ], NodeFlags.Const)
+          factory.createVariableDeclarationList(
+            [
+              factory.createVariableDeclaration(
+                "row",
+                undefined,
+                undefined,
+                factory.createElementAccessExpression(
+                  factory.createIdentifier("rows"),
+                  factory.createNumericLiteral("0")
+                )
+              ),
+            ],
+            NodeFlags.Const
+          )
+        ),
+        factory.createIfStatement(
+          factory.createPrefixUnaryExpression(
+            SyntaxKind.ExclamationToken,
+            factory.createIdentifier("row")
+          ),
+          factory.createBlock(
+            [factory.createReturnStatement(factory.createNull())],
+            true
+          ),
+          undefined
         ),
         factory.createReturnStatement(
           factory.createObjectLiteralExpression(