diff --git a/websocket-sharp/Net/EndPointListener.cs b/websocket-sharp/Net/EndPointListener.cs
index e059d097..08c5c888 100644
--- a/websocket-sharp/Net/EndPointListener.cs
+++ b/websocket-sharp/Net/EndPointListener.cs
@@ -301,21 +301,19 @@ namespace WebSocketSharp.Net
 
       try {
         conn = new HttpConnection (socket, listener);
-
-        lock (listener._unregisteredSync)
-          listener._unregistered.Add (conn);
-
-        conn.BeginReadRequest ();
       }
-      catch {
-        if (conn != null) {
-          conn.Close (true);
-
-          return;
-        }
+      catch (Exception) {
+        // TODO: Logging.
 
         socket.Close ();
+
+        return;
       }
+
+      lock (listener._unregisteredSync)
+        listener._unregistered.Add (conn);
+
+      conn.BeginReadRequest ();
     }
 
     private static bool removeSpecial (