diff --git a/source/tristanable/watcher.d b/source/tristanable/watcher.d
index b3409b8..7062d82 100644
--- a/source/tristanable/watcher.d
+++ b/source/tristanable/watcher.d
@@ -59,7 +59,7 @@ public final class Watcher : Thread
     {
         /* We acre about `endpoint` status changes */
         socketSetR = new SocketSet();
-        socketSetR.add(endpoint);
+       
 
         socketSetW = new SocketSet();
         socketSetE = new SocketSet();
@@ -78,6 +78,9 @@ public final class Watcher : Thread
             /* The message's data */
             byte[] receivedMessage;
 
+            /* We want to check if `endpoint` can be read from */
+            socketSetR.add(endpoint);
+
             /* Check if the endpoint has any data available */
             int status = Socket.select(socketSetR, socketSetW, socketSetE, timeOut);
 
@@ -100,6 +103,7 @@ public final class Watcher : Thread
                 if(socketSetR.isSet(endpoint))
                 {
                     /* Do nothing (fall through) */
+
                 }
                 /* We have an error */
                 else