From fd5eb3efca23481c34fffc01ad2c0a40987e537f Mon Sep 17 00:00:00 2001
From: Ylian Saint-Hilaire <ysainthilaire@hotmail.com>
Date: Mon, 12 Apr 2021 15:27:44 -0700
Subject: [PATCH] Fix for #2498

---
 amt/amt-wsman-comm.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/amt/amt-wsman-comm.js b/amt/amt-wsman-comm.js
index 696e001d..0272b05c 100644
--- a/amt/amt-wsman-comm.js
+++ b/amt/amt-wsman-comm.js
@@ -452,7 +452,12 @@ var CreateWsmanComm = function (host, port, user, pass, tls, tlsoptions, mpsConn
         //obj.Debug("xxOnSocketClosed");
         obj.socketState = 0;
         if (obj.socket != null) {
-            if (obj.socket.removeAllListeners) { obj.socket.removeAllListeners(); }
+            if (obj.socket.removeAllListeners) {
+                // Do not remove the error handler since it may still get triggered.
+                obj.socket.removeAllListeners('data');
+                obj.socket.removeAllListeners('close');
+                obj.socket.removeAllListeners('timeout');
+            }
             try {
                 if (obj.mpsConnection == null) {
                     obj.socket.destroy();