diff --git a/lib/native/index.js b/lib/native/index.js
index 18bddc6..3faa92a 100644
--- a/lib/native/index.js
+++ b/lib/native/index.js
@@ -7,7 +7,7 @@ var NativeQuery = require('./query');
 
 var Client = module.exports = function(config) {
   EventEmitter.call(this);
-  this.native = new Native();
+  this.native = new Native(require('pg-types'));
   this._queryQueue = [];
   this._connected = false;
 
@@ -106,6 +106,9 @@ Client.prototype.query = function(config, values, callback) {
 
 Client.prototype.end = function(cb) {
   var self = this;
+  if(!this._connected) {
+    this.once('connect', this.end.bind(this, cb));
+  }
   this.native.end(function() {
     //send an error to the active query
     if(self._hasActiveQuery()) {
diff --git a/test/integration/client/query-error-handling-prepared-statement-tests.js b/test/integration/client/query-error-handling-prepared-statement-tests.js
index 8e46bfe..1516465 100644
--- a/test/integration/client/query-error-handling-prepared-statement-tests.js
+++ b/test/integration/client/query-error-handling-prepared-statement-tests.js
@@ -81,4 +81,3 @@ test('client end during query execution of prepared statement', function() {
     client.end();
   }));
 });
-return console.log('query-error-handling-prepared-statement-tests: GET TO PASS');
diff --git a/test/integration/client/quick-disconnect-tests.js b/test/integration/client/quick-disconnect-tests.js
index d36b570..a1b6bab 100644
--- a/test/integration/client/quick-disconnect-tests.js
+++ b/test/integration/client/quick-disconnect-tests.js
@@ -1,7 +1,6 @@
 //test for issue #320
 //
 var helper = require('./test-helper');
-return console.log('quick-disconnecte-tests: GET TO PASS');
 
 var client = new helper.pg.Client(helper.config);
 client.connect();
diff --git a/test/integration/connection-pool/max-connection-tests.js b/test/integration/connection-pool/max-connection-tests.js
index 61755a0..3e40bf0 100644
--- a/test/integration/connection-pool/max-connection-tests.js
+++ b/test/integration/connection-pool/max-connection-tests.js
@@ -1,3 +1,4 @@
 var helper = require(__dirname + "/test-helper")
+return console.log('BAD RACE CONDITION');
 helper.testPoolSize(10);
 helper.testPoolSize(11);