diff --git a/Server/AsyncServer.py b/Server/AsyncServer.py
index e68d2d3..4b28824 100644
--- a/Server/AsyncServer.py
+++ b/Server/AsyncServer.py
@@ -4,6 +4,7 @@ import Logging
 
 import sys
 from Utils import capture_trace
+from Utils import is_socket_related_error
 import socket
 import _thread
 
@@ -14,7 +15,7 @@ class Server:
 		self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 		self.sock.bind(host_port_pair)
 		self.sock.listen(2)
-		self.socks = []
+		self.handlers = []
 		self.debug = debug
 
 
@@ -22,43 +23,30 @@ class Server:
 		self.handler = handler
 		while 1:
 			sock, info = self.sock.accept()
-			self.socks.append(sock)
-			_thread.start_new_thread(self.controller, (sock, info, handler_args))
+			sock = ESock(sock) if not self.debug else ESock(sock, debug=self.debug)
+			handler = self.handler(sock, info, **handler_args)
+			self.handlers.append(handler)
+			_thread.start_new_thread(self.controller, (handler, ))
 
 
 	def stop(self):
-		for sock in self.socks:
-			try:
-				sock.close()
-			except (socket.error, OSError):
-				pass
-		self.sock.close()
+		for handler in self.handlers:
+			self.attempt_graceful_close(handler, handler.sock)
 
-	def controller(self, sock, info, handler_args):
-		sock = ESock(sock) if not self.debug else ESock(sock, debug=self.debug)
-		handler = self.handler(sock, info, **handler_args)
+
+	def controller(self, handler):
 		while 1:
 			try:
-				data, route = sock.recv()
+				data, route = handler.sock.recv()
 				handler.handle(data, route)
-			except (BrokenPipeError, ConnectionResetError, OSError) as e:
-				socket_related_error = True
-				if type(e) not in (BrokenPipeError, ConnectionResetError, OSError):
-					socket_related_error = False
-				if type(e) is OSError:
-					if str(e) not in ("Connection closed", "[Errno 9] Bad file descriptor"):
-						socket_related_error = False
-				if not socket_related_error:
-					self.print_trace(handler, sock)
-				self.attempt_graceful_close(handler, sock)
-				_thread.exit()
-			except Exception:
-				self.print_trace(handler, sock)
-				self.attempt_graceful_close(handler, sock)
+			except Exception as e:
+				if not is_socket_related_error(e):
+					self.print_trace(handler.sock)
+				self.attempt_graceful_close(handler, handler.sock)
 				_thread.exit()
 
 
-	def print_trace(self, handler, sock):
+	def print_trace(self, sock):
 		Logging.error("An unhandled exception forced the controller for '%s:%d' to terminate." % (sock.address, sock.port))
 		capture_trace()
 
@@ -69,9 +57,9 @@ class Server:
 		except Exception:
 			self.print_trace(handler, sock)
 		finally:		
-			if sock in self.socks:
-				del self.socks[self.socks.index(sock)]
-			sock.close()
+			if handler in self.handlers:
+				del self.handlers[self.handlers.index(handler)]
+			handler.sock.close()
 	
 
 	class Handler: