diff --git a/lib/client.js b/lib/client.js
index 7202f421..4d7082c2 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -213,7 +213,9 @@ p.onDataRow = function(msg) {
   var converters = this.converters || [];
   var len = msg.fields.length;
   for(var i = 0; i < len; i++) {
-    fields[i] = this.converters[i] (fields[i]);
+    if(fields[i] !== null) {
+      fields[i] = this.converters[i] (fields[i]);
+    }
   }
   msg.fields = fields;
   this.emit('row', msg);
diff --git a/test/unit/client/typed-query-results.js b/test/unit/client/typed-query-results.js
index d856504e..ec60cbe6 100644
--- a/test/unit/client/typed-query-results.js
+++ b/test/unit/client/typed-query-results.js
@@ -58,6 +58,11 @@ test('typed results', function() {
     dataTypeID: 16,
     actual: 'f',
     expected: false
+  },{
+    name: 'boolean null',
+    dataTypeID: 16,
+    actual: null,
+    expected: null
   }];