diff --git a/src/sakia/core/net/node.py b/src/sakia/core/net/node.py
index 44b5195932d88b40e4b13278219ebc02018ba378..9ab058cad3b8db0309af78909203ac1e1e09e4f9 100644
--- a/src/sakia/core/net/node.py
+++ b/src/sakia/core/net/node.py
@@ -11,7 +11,7 @@ from ...tools.decorators import asyncify
 from duniterpy.api import bma, errors
 from duniterpy.api.bma import ConnectionHandler
 
-from aiohttp.errors import WSClientDisconnectedError, WSServerHandshakeError, ClientResponseError
+from aiohttp.errors import WSServerHandshakeError, ClientResponseError
 from aiohttp.errors import ClientError, DisconnectedError
 from asyncio import TimeoutError
 import logging
@@ -367,7 +367,7 @@ class Node(QObject):
                             break
                         elif msg.tp == aiohttp.MsgType.error:
                             break
-            except (WSServerHandshakeError, WSClientDisconnectedError, ClientResponseError, ValueError) as e:
+            except (WSServerHandshakeError, ClientResponseError, ValueError) as e:
                 logging.debug("Websocket block {0} : {1} - {2}".format(type(e).__name__, str(e), self.pubkey[:5]))
                 await self.request_current_block()
             except (ClientError, gaierror, TimeoutError, DisconnectedError) as e:
@@ -566,7 +566,7 @@ class Node(QObject):
                             break
                         elif msg.tp == aiohttp.MsgType.error:
                             break
-            except (WSServerHandshakeError, WSClientDisconnectedError, ClientResponseError, ValueError) as e:
+            except (WSServerHandshakeError, ClientResponseError, ValueError) as e:
                 logging.debug("Websocket peer {0} : {1} - {2}".format(type(e).__name__, str(e), self.pubkey[:5]))
                 await self.request_peers()
             except (ClientError, gaierror, TimeoutError, DisconnectedError) as e:
diff --git a/src/sakia/tests/mocks/server.py b/src/sakia/tests/mocks/server.py
index 14bb1317acefbac9805c15e19ba08ba52b15e0c5..c49456267a585f2d22e07d8d696183f94934bc7b 100644
--- a/src/sakia/tests/mocks/server.py
+++ b/src/sakia/tests/mocks/server.py
@@ -44,12 +44,7 @@ class MockServer():
         self.requests = []
         self.app = web.Application(loop=self.lp,
                                    middlewares=[self.middleware_factory])
-
-        self.handler = self.app.make_handler(
-            keep_alive_on=False,
-            access_log=log.access_logger,
-        )
-
+        self.handler = None
         self.port = self.find_unused_port()
 
     def get_request(self, i):
@@ -90,12 +85,17 @@ class MockServer():
         return peer_document_generator(self.port)
 
     async def create_server(self, ssl_ctx=None):
-        srv = await self.lp.create_server(self.handler, '127.0.0.1', self.port)
         protocol = "https" if ssl_ctx else "http"
         url = "{}://127.0.0.1:{}".format(protocol, self.port)
 
         self.add_route('GET', '/network/peering', bma_peering_generator(self.port))
 
+        self.handler = self.app.make_handler(
+            keep_alive_on=False,
+            access_log=log.access_logger,
+        )
+
+        srv = await self.lp.create_server(self.handler, '127.0.0.1', self.port)
         return srv, self.port, url
 
     async def close(self):
diff --git a/src/sakia/tests/quamash_utils.py b/src/sakia/tests/quamash_utils.py
index 7c11293ca4cbacbda7815318d3923c4b91eca84f..591b566d6df12daffe296d1f2ab02f3e64e10b49 100644
--- a/src/sakia/tests/quamash_utils.py
+++ b/src/sakia/tests/quamash_utils.py
@@ -10,6 +10,7 @@ class QuamashTest:
     def setUpQuamash(self):
         self.qapplication = get_application()
         self.lp = quamash.QSelectorEventLoop(self.qapplication)
+        self.qapplication.setQuitOnLastWindowClosed(False)
         asyncio.set_event_loop(self.lp)
         self.lp.set_exception_handler(lambda l, c: unitttest_exception_handler(self, l, c))
         self.exceptions = []