diff --git a/SimpleWebsocketServer/WebsocketEventArg.cs b/SimpleWebsocketServer/WebsocketEventArg.cs
index 846d435..7672996 100644
--- a/SimpleWebsocketServer/WebsocketEventArg.cs
+++ b/SimpleWebsocketServer/WebsocketEventArg.cs
@@ -38,7 +38,7 @@ public class WebSocketEventArg : EventArgs
         /// <summary>
         /// Message length in bytes.
         /// </summary>
-        public UInt64 messageLength { get; set; }= 0;
+        public UInt64 messageLength { get; set; } = 0;
         /// <summary>
         /// Client ID set by client or generated by server when connecting to websocket server.
         /// </summary>
diff --git a/SimpleWebsocketServer/WebsocketHandler.cs b/SimpleWebsocketServer/WebsocketHandler.cs
index 33f6a03..5130b77 100644
--- a/SimpleWebsocketServer/WebsocketHandler.cs
+++ b/SimpleWebsocketServer/WebsocketHandler.cs
@@ -102,7 +102,21 @@ public async void StartConnection(TcpClient client,  string clientId, string bas
             WebSocketServer newServer = new WebSocketServer(info, _BufferSize);
             newServer.WebSocketServerEvent += OnWebsocketEvent;
             _ListWithConnections.Add(info, newServer);
-            await newServer.StartServerAsync();
+            try
+            {
+                await newServer.StartServerAsync();
+            }
+            catch(Exception)
+            {
+                WebSocketEventArg args = new WebSocketEventArg()
+                {
+                    clientId = clientId,
+                    clientBaseUrl = baseUrl,
+                    errorMessage = "Client disconnected forcefully",
+                    isClosed = true
+                };
+                OnWebsocketEvent(this, args);
+            }
         }
 
         /// <summary>
@@ -186,17 +200,17 @@ public async Task<bool> StopAll()
         /// <returns>True on success.</returns>
         public async Task<bool> StopAll(string reason)
         {
-            bool succes = false;
+            bool success = false;
             foreach (var connection in _ListWithConnections)
             {
-                succes = await connection.Value.StopServerAsync();
+                success = await connection.Value.StopServerAsync();
             }
 
-            if (succes)
+            if (success)
             {
                 _ListWithConnections.Clear();
             }
-            return succes;
+            return success;
         }
 
         /// <summary>
@@ -241,7 +255,6 @@ public async Task<bool> SendMessage(WebSocketMessageContainer message)
         /// <param name="arg">Arguments containing event arguments.</param>
         public void OnWebsocketEvent(object sender, WebSocketEventArg arg)
         {
-
             if (arg.isClosed)
             {
                 WebSocketClientInfo key = null;
diff --git a/WebSocketServerTestNET/Program.cs b/WebSocketServerTestNET/Program.cs
index a35bbda..b716925 100644
--- a/WebSocketServerTestNET/Program.cs
+++ b/WebSocketServerTestNET/Program.cs
@@ -81,7 +81,6 @@ private static async void OnWebsocketEvent(object sender, WebSocketEventArg args
                 }
                 else
                 {
-                    string received = Encoding.UTF8.GetString(args.data);
                     Console.WriteLine("Client: " + args.clientId + " disconnected.");
                 }
             }