diff --git a/imap-core/lib/imap-connection.js b/imap-core/lib/imap-connection.js
index 6e1aa8a2..b61d8857 100644
--- a/imap-core/lib/imap-connection.js
+++ b/imap-core/lib/imap-connection.js
@@ -265,14 +265,16 @@ class IMAPConnection extends EventEmitter {
 
         if (err && /SSL23_GET_CLIENT_HELLO/.test(err.message)) {
             let message = err.message;
-            err.message = 'Failed to establish TLS session to ' + this.remoteAddress;
+            err.message = 'Failed to establish TLS session';
             err.meta = {
+                protocol: 'imap',
+                stage: 'starttls',
                 message,
                 remoteAddress: this.remoteAddress
             };
         }
         if (!err) {
-            err = new Error('Socket closed unexpectedly to ' + this.remoteAddress);
+            err = new Error('Socket closed unexpectedly');
             err.meta = {
                 remoteAddress: this.remoteAddress
             };
diff --git a/imap-core/lib/imap-server.js b/imap-core/lib/imap-server.js
index 592efc5d..cf73eea2 100644
--- a/imap-core/lib/imap-server.js
+++ b/imap-core/lib/imap-server.js
@@ -198,14 +198,16 @@ class IMAPServer extends EventEmitter {
             returned = true;
             if (err && /SSL23_GET_CLIENT_HELLO/.test(err.message)) {
                 let message = err.message;
-                err.message = 'Failed to establish TLS session on connection to ' + remoteAddress;
+                err.message = 'Failed to establish TLS session';
                 err.meta = {
+                    protocol: 'imap',
+                    stage: 'connect',
                     message,
                     remoteAddress
                 };
             }
             if (!err) {
-                err = new Error('Socket closed unexpectedly to ' + remoteAddress);
+                err = new Error('Socket closed unexpectedly');
                 err.meta = {
                     remoteAddress
                 };
diff --git a/lib/pop3/server.js b/lib/pop3/server.js
index 56acc8b0..37011354 100644
--- a/lib/pop3/server.js
+++ b/lib/pop3/server.js
@@ -74,19 +74,19 @@ class POP3Server extends EventEmitter {
             returned = true;
             if (err && /SSL23_GET_CLIENT_HELLO/.test(err.message)) {
                 let message = err.message;
-                err.message = 'Failed to establish TLS session on connection to ' + remoteAddress;
+                err.message = 'Failed to establish TLS session on connection';
                 err.meta = {
                     message,
                     remoteAddress
                 };
             }
             if (!err) {
-                err = new Error('Socket closed unexpectedly to ' + remoteAddress);
+                err = new Error('Socket closed unexpectedly');
                 err.meta = {
                     remoteAddress
                 };
             }
-            callback(err || new Error('Socket closed unexpectedly'));
+            callback(err);
         };
 
         // remove all listeners from the original socket besides the error handler