diff --git a/src/Site/SiteAnnouncer.py b/src/Site/SiteAnnouncer.py
index 309f2a96..cfa16ab2 100644
--- a/src/Site/SiteAnnouncer.py
+++ b/src/Site/SiteAnnouncer.py
@@ -106,7 +106,7 @@ class SiteAnnouncer(object):
         gevent.joinall(threads, timeout=20)  # Wait for announce finish
 
         for thread in threads:
-            if thread.value is None or type(thread.value) is GreenletExit:
+            if thread.value is None:
                 continue
             if thread.value is not False:
                 if thread.value > 1.0:  # Takes more than 1 second to announce
diff --git a/src/util/GreenletManager.py b/src/util/GreenletManager.py
index 6379f97c..7245d05c 100644
--- a/src/util/GreenletManager.py
+++ b/src/util/GreenletManager.py
@@ -1,4 +1,5 @@
 import gevent
+from Debug import Debug
 
 
 class GreenletManager:
@@ -17,7 +18,7 @@ class GreenletManager:
         self.greenlets.add(greenlet)
         return greenlet
 
-    def stopGreenlets(self, reason="Stopping greenlets"):
+    def stopGreenlets(self, reason="Stopping all greenlets"):
         num = len(self.greenlets)
-        gevent.killall(list(self.greenlets))
+        gevent.killall(list(self.greenlets), Debug.Notify(reason), block=False)
         return num