diff --git a/packages/pg/lib/client.js b/packages/pg/lib/client.js
index 4ccaffeac..3553be08a 100644
--- a/packages/pg/lib/client.js
+++ b/packages/pg/lib/client.js
@@ -299,7 +299,7 @@ class Client extends EventEmitter {
     this.secretKey = msg.secretKey
   }
 
-  _handleReadyForQuery(msg) {
+  _handleReadyForQuery() {
     if (this._connecting) {
       this._connecting = false
       this._connected = true
@@ -318,7 +318,7 @@ class Client extends EventEmitter {
     this.activeQuery = null
     this.readyForQuery = true
     if (activeQuery) {
-      activeQuery.handleReadyForQuery(this.connection)
+      activeQuery.handleReadyForQuery()
     }
     this._pulseQueryQueue()
   }
diff --git a/packages/pg/lib/query.js b/packages/pg/lib/query.js
index 06b582f6f..0e460ef1c 100644
--- a/packages/pg/lib/query.js
+++ b/packages/pg/lib/query.js
@@ -80,12 +80,11 @@ class Query extends EventEmitter {
   }
 
   handleDataRow(msg) {
-    let row
-
     if (this._canceledDueToError) {
       return
     }
 
+    let row
     try {
       row = this._result.parseRow(msg.fields)
     } catch (err) {
@@ -119,7 +118,7 @@ class Query extends EventEmitter {
     }
   }
 
-  handleError(err, connection) {
+  handleError(err) {
     // need to sync after error during a prepared statement
     if (this._canceledDueToError) {
       err = this._canceledDueToError
@@ -133,9 +132,9 @@ class Query extends EventEmitter {
     this.emit('error', err)
   }
 
-  handleReadyForQuery(con) {
+  handleReadyForQuery() {
     if (this._canceledDueToError) {
-      return this.handleError(this._canceledDueToError, con)
+      return this.handleError(this._canceledDueToError)
     }
     if (this.callback) {
       try {
diff --git a/packages/pg/lib/result.js b/packages/pg/lib/result.js
index 2e4fca3f8..ae98c2bff 100644
--- a/packages/pg/lib/result.js
+++ b/packages/pg/lib/result.js
@@ -53,8 +53,6 @@ class Result {
       var rawValue = rowData[i]
       if (rawValue !== null) {
         row[i] = this._parsers[i](rawValue)
-      } else {
-        row[i] = null
       }
     }
     return row
@@ -67,8 +65,6 @@ class Result {
       var field = this.fields[i].name
       if (rawValue !== null) {
         row[field] = this._parsers[i](rawValue)
-      } else {
-        row[field] = null
       }
     }
     return row