diff --git a/libretroshare b/libretroshare
index 47548627a..55efaf9c7 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 47548627adddc444a5d36368bd7a5f5baeed17ba
+Subproject commit 55efaf9c730859ef3fc5c6f6049595c1225f9204
diff --git a/retroshare-friendserver/src/network.cc b/retroshare-friendserver/src/network.cc
index 3ed5b22a2..a607a89c2 100644
--- a/retroshare-friendserver/src/network.cc
+++ b/retroshare-friendserver/src/network.cc
@@ -134,7 +134,9 @@ bool FsNetworkInterface::checkForNewConnections()
 
     if(clintConnt < 0)
     {
-        if(errno == EWOULDBLOCK)
+        int err = rs_socket_error();
+
+        if(err == EWOULDBLOCK || err == EAGAIN)
             ;//RsErr()<< "Incoming connection with nothing to read!" << std::endl;
         else
             RsErr()<< "Error when accepting connection." << std::endl;