diff --git a/lib/auth.js b/lib/auth.js
index aa044f8..b75a0c7 100644
--- a/lib/auth.js
+++ b/lib/auth.js
@@ -5,6 +5,19 @@ var Buffer = require('buffer').Buffer;
 // add 'unpack' method for buffer
 require('./unpackbuffer').addUnpack(Buffer);
 
+var typeToName = {
+    256: 'Local',
+  65535: 'Wild',
+    254: 'Netname',
+    253: 'Krb5Principal',
+    252: 'LocalHost',
+      0: 'Internet',
+      1: 'DECnet',
+      2: 'Chaos',
+      5: 'ServerInterpreted',
+      6: 'InternetV6'
+};
+
 function parseXauth( buf )
 {
     var offset = 0;
@@ -14,20 +27,7 @@ function parseXauth( buf )
     while (offset < buf.length)
     {
         var cookie = {};
-        var typeToName = {
-            256: 'Local',
-          65535: 'Wild',
-            254: 'Netname',
-            253: 'Krb5Principal',
-            252: 'LocalHost',
-              0: 'Internet',
-              1: 'DECnet',
-              2: 'Chaos',
-              5: 'ServerInterpreted',
-              6: 'InternetV6'
-        };
         cookie.type = buf.readUInt16LE(offset);
-        console.log('Cookie type: ');
         if (!typeToName[cookie.type]) {
             console.warn('Unknown address type');
         }
@@ -76,7 +76,8 @@ module.exports = function( display, host, cb )
     for (var cookieNum in auth)
     {
       var cookie = auth[cookieNum];
-      if (cookie.display === display && cookie.address === host)
+      if ((typeToName[cookie.family] === 'Wild' || cookie.address === host) &&
+          (cookie.display.length === 0 || cookie.display === display))
         return cb( null, cookie );
     }
     cb(new Error('No auth cookie matching display=' + display + ' and  host=' + host));
diff --git a/lib/handshake.js b/lib/handshake.js
index 7dda277..45f08b0 100644
--- a/lib/handshake.js
+++ b/lib/handshake.js
@@ -192,7 +192,9 @@ function getByteOrder() {
 function writeClientHello(stream, displayNum, authHost)
 {
     getAuthString( displayNum, authHost, function( err, cookie ) {
-        debugger;
+        if (err) {
+            throw err;
+        }
         var byte_order = getByteOrder();
         var protocol_major = 11; // TODO: config? env?
         var protocol_minor = 0;