diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}
 				
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/commons/network/ReadThread.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/commons/network/ReadThread.java
index b238c399ad..4732d782a3 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/commons/network/ReadThread.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/commons/network/ReadThread.java
@@ -1,7 +1,6 @@
 package org.l2jmobius.commons.network;
 
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.Set;
 
 /**
@@ -204,10 +203,6 @@ public class ReadThread<E extends NetClient> implements Runnable
 							}
 						}
 					}
-					catch (SocketTimeoutException e)
-					{
-						onDisconnection(client);
-					}
 					catch (Exception e) // Unexpected disconnection?
 					{
 						onDisconnection(client);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/commons/network/SendThread.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/commons/network/SendThread.java
index 96b03292dc..9ca34876a4 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/commons/network/SendThread.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/commons/network/SendThread.java
@@ -78,6 +78,8 @@ public class SendThread<E extends NetClient> implements Runnable
 					}
 					catch (Exception ignored)
 					{
+						_pool.remove(client);
+						client.onDisconnection();
 					}
 				}