diff --git a/packages/pg-pool/index.js b/packages/pg-pool/index.js
index 5e846bb31..20dbe734c 100644
--- a/packages/pg-pool/index.js
+++ b/packages/pg-pool/index.js
@@ -406,20 +406,24 @@ class Pool extends EventEmitter {
 
       client.once('error', onError)
       this.log('dispatching query')
-      client.query(text, values, (err, res) => {
-        this.log('query dispatched')
-        client.removeListener('error', onError)
-        if (clientReleased) {
-          return
-        }
-        clientReleased = true
-        client.release(err)
-        if (err) {
-          return cb(err)
-        } else {
-          return cb(undefined, res)
-        }
-      })
+      try {
+        client.query(text, values, (err, res) => {
+          this.log('query dispatched')
+          client.removeListener('error', onError)
+          if (clientReleased) {
+            return
+          }
+          clientReleased = true
+          client.release(err)
+          if (err) {
+            return cb(err)
+          } else {
+            return cb(undefined, res)
+          }
+        })
+      } catch (err) {
+        return cb(err)
+      }
     })
     return response.result
   }
diff --git a/packages/pg-pool/test/error-handling.js b/packages/pg-pool/test/error-handling.js
index 0a996b82b..f514bd79f 100644
--- a/packages/pg-pool/test/error-handling.js
+++ b/packages/pg-pool/test/error-handling.js
@@ -37,6 +37,17 @@ describe('pool error handling', function () {
     })
   })
 
+  it('Catches errors in client.query', async function () {
+    await expect((new Pool()).query(null)).to.throwError()
+    await expect(async () => {
+      try {
+        await (new Pool()).query(null)
+      } catch (e) {
+        console.log(e)
+      }
+    }).not.to.throwError()
+  })
+
   describe('calling release more than once', () => {
     it(
       'should throw each time',