diff --git a/cbpi/__init__.py b/cbpi/__init__.py
index 18a652d..13869a7 100644
--- a/cbpi/__init__.py
+++ b/cbpi/__init__.py
@@ -1,3 +1,3 @@
-__version__ = "4.1.7.a13"
+__version__ = "4.1.7.a14"
 __codename__ = "Groundhog Day"
 
diff --git a/cbpi/controller/satellite_controller.py b/cbpi/controller/satellite_controller.py
index 7060401..dad797a 100644
--- a/cbpi/controller/satellite_controller.py
+++ b/cbpi/controller/satellite_controller.py
@@ -70,6 +70,10 @@ class SatelliteController:
                                 method = topic_filter[1]
                                 if message.topic.matches(topic):
                                     await (method(message))
+            except asyncio.CancelledError:
+                # Cancel
+                self.logger.warning("MQTT Listening Cancelled")
+                break
             except MqttError as e:
                 self.logger.error("MQTT Exception: {}".format(e))
             except Exception as e:
@@ -164,7 +168,7 @@ class SatelliteController:
                                 await method(message.payload.decode())
             except asyncio.CancelledError:
                 # Cancel
-                self.logger.warning("Sub Cancelled")
+                self.logger.warning("Subscription {} Cancelled".format(topic))
                 self.error=True
             except MqttError as e:
                 self.logger.error("Sub MQTT Exception: {}".format(e))