diff --git a/lib/goldilocks.js b/lib/goldilocks.js
index aea33bb..732678b 100644
--- a/lib/goldilocks.js
+++ b/lib/goldilocks.js
@@ -53,8 +53,24 @@ module.exports.create = function (deps, config) {
     conn.close();
   }
   function netHandler(conn, opts) {
+    function getProp(name) {
+      return opts[name] || opts['_'+name] || conn[name] || conn['_'+name];
+    }
     opts = opts || {};
-    console.log('[netHandler]', conn.localAddress, conn.localPort, opts.encrypted);
+    var logName = getProp('remoteAddress') + ':' + getProp('remotePort') + ' -> ' +
+                  getProp('localAddress')  + ':' + getProp('localPort');
+    console.log('[netHandler]', logName, 'encrypted: '+opts.encrypted);
+
+    var start = Date.now();
+    conn.on('timeout', function () {
+      console.log('[netHandler]', logName, 'connection timed out', (Date.now()-start)/1000);
+    });
+    conn.on('end', function () {
+      console.log('[netHandler]', logName, 'connection ended', (Date.now()-start)/1000);
+    });
+    conn.on('close', function () {
+      console.log('[netHandler]', logName, 'connection closed', (Date.now()-start)/1000);
+    });
 
     // XXX PEEK COMMENT XXX
     // TODO we can have our cake and eat it too
diff --git a/lib/modules/http.js b/lib/modules/http.js
index 887e417..048d3ac 100644
--- a/lib/modules/http.js
+++ b/lib/modules/http.js
@@ -426,8 +426,9 @@ module.exports.create = function (deps, conf, greenlockMiddleware) {
                   if (handled) { return handled; }
                   return moduleChecks[mod.name](mod, conn, opts, headers);
                 });
+              } else {
+                console.warn('unknown HTTP module under domains', dom.names.join(','), mod);
               }
-              console.warn('unknown HTTP module under domains', dom.names.join(','), mod);
             });
             return subProm;
           });