diff --git a/copyparty/mdns.py b/copyparty/mdns.py
index d747e8f6..45ec30bf 100644
--- a/copyparty/mdns.py
+++ b/copyparty/mdns.py
@@ -278,6 +278,9 @@ class MDNS(MCast):
                 try:
                     self.eat(buf, addr, sck)
                 except:
+                    if not self.running:
+                        return
+
                     t = "{} {} \033[33m|{}| {}\n{}".format(
                         self.srv[sck].name, addr, len(buf), repr(buf)[2:-1], min_ex()
                     )
diff --git a/copyparty/svchub.py b/copyparty/svchub.py
index 8bf48a4f..edb81132 100644
--- a/copyparty/svchub.py
+++ b/copyparty/svchub.py
@@ -508,8 +508,8 @@ class SvcHub(object):
                         self.pr("waiting for thumbsrv (10sec)...")
 
             if hasattr(self, "smbd"):
-                Daemon(self.kill9, a=(1,))
-                self.smbd.stop()
+                slp = max(slp, time.time() + 0.5)
+                Daemon(self.smbd.stop)
 
             while time.time() < slp:
                 time.sleep(0.1)