diff --git a/websocket-sharp/Net/EndPointListener.cs b/websocket-sharp/Net/EndPointListener.cs
index 08c5c888..86402f72 100644
--- a/websocket-sharp/Net/EndPointListener.cs
+++ b/websocket-sharp/Net/EndPointListener.cs
@@ -270,17 +270,19 @@ namespace WebSocketSharp.Net
       try {
         sock = lsnr._socket.EndAccept (asyncResult);
       }
-      catch (SocketException) {
-        // TODO: Logging.
-      }
       catch (ObjectDisposedException) {
         return;
       }
+      catch (Exception) {
+        // TODO: Logging.
+      }
 
       try {
         lsnr._socket.BeginAccept (onAccept, lsnr);
       }
-      catch {
+      catch (Exception) {
+        // TODO: Logging.
+
         if (sock != null)
           sock.Close ();