Closes hapijs#3381

Author: hueniverse

lib/connection.js

@@ -16,7 +16,6 @@ const Auth = require('./auth');
 const Compression = require('./compression');
 const Cors = require('./cors');
 const Ext = require('./ext');
-const Promises = require('./promises');
 const Route = require('./route');
 
 
@@ -281,7 +280,7 @@ internals.Connection.prototype._dispatch = function (options) {
 internals.Connection.prototype.inject = function (options, callback) {
 
     if (!callback) {
-        return Promises.wrap(this, this.inject, [options]);
+        return new Promise((resolve, reject) => this.inject(options, (res) => resolve(res)));
     }
 
     let settings = options;

lib/promises.js

@@ -12,10 +12,10 @@ exports.wrap = function (bind, method, args) {
 
     return new Promise((resolve, reject) => {
 
-        const callback = (result) => {
+        const callback = (err, result) => {
 
-            if (result instanceof Error) {
-                return reject(result);
+            if (err) {
+                return reject(err);
             }
 
             return resolve(result);