diff --git a/bw_client.py b/bw_client.py
index 7d555c6..2118c8c 100644
--- a/bw_client.py
+++ b/bw_client.py
@@ -68,6 +68,9 @@ if not bwConfig.loadConfigFile(paths.CONFIG_PATH + args.config):
     exit(1)
 
 # ========== CLIENT CODE ==========
+mmThread = None
+bwClient = None
+
 try:
     ip = bwConfig.get("server", "ip", default="127.0.0.1")
     port = bwConfig.get("server", "port", default="8080")
@@ -198,7 +201,9 @@ except:  # pragma: no cover
     logging.exception("BOSWatch interrupted by an error")
 finally:
     logging.debug("Starting shutdown routine")
-    bwClient.disconnect()
+    if bwClient:
+        bwClient.disconnect()
     inputThreadRunning = False
-    mmThread.join()
+    if mmThread:
+        mmThread.join()
     logging.debug("BOSWatch client has stopped ...")
diff --git a/bw_server.py b/bw_server.py
index abf0fef..82ccbf7 100644
--- a/bw_server.py
+++ b/bw_server.py
@@ -46,7 +46,6 @@ from boswatch.network.broadcast import BroadcastServer
 from boswatch.router.routerManager import RouterManager
 from boswatch.utils import misc
 
-
 header.logoToLog()
 header.infoToLog()
 
@@ -67,8 +66,11 @@ if not bwConfig.loadConfigFile(paths.CONFIG_PATH + args.config):
     exit(1)
 
 # ############################# begin server system
-try:
+bwRoutMan = None
+bwServer = None
+bcServer = None
 
+try:
     bwRoutMan = RouterManager()
     if not bwRoutMan.buildRouter(bwConfig):
         logging.fatal("Error while building routers")
@@ -109,7 +111,10 @@ except:  # pragma: no cover
     logging.exception("BOSWatch interrupted by an error")
 finally:
     logging.debug("Starting shutdown routine")
-    del bwRoutMan
-    bwServer.stop()
-    bcServer.stop()
+    if bwRoutMan:
+        del bwRoutMan
+    if bwServer:
+        bwServer.stop()
+    if bcServer:
+        bcServer.stop()
     logging.debug("BOSWatch server has stopped ...")