diff --git a/mopidy_iris/core.py b/mopidy_iris/core.py
index 2992afab..38184892 100755
--- a/mopidy_iris/core.py
+++ b/mopidy_iris/core.py
@@ -42,6 +42,20 @@ class IrisCore(object):
     snapcast_listener = False
 
 
+    ##
+    # Create our ongoing notification listener
+    #
+    # TODO: Make non-blocking
+    ##
+    def create_snapcast_listener(self):
+        try:
+            listener = self.new_snapcast_socket()
+            self.snapcast_listener = listener
+            logger.info("Iris connected to Snapcast")
+        except Exception, e:
+            logger.error("Iris could not connect to Snapcast: %s" % e)
+
+
     ##
     # Create a new snapcast TCP connection
     #
@@ -53,14 +67,16 @@ class IrisCore(object):
             snapcast.connect((self.config['iris']['snapcast_host'], self.config['iris']['snapcast_port']))
         except socket.gaierror, e:
             logger.error("Iris could not connect to Snapcast: %s" % e)
-            raise e;
+            raise Exception(e);
         except socket.error, e:
             logger.error("Iris could not connect to Snapcast: %s" % e)
-            raise e;
+            raise Exception(e);
         
         return snapcast
 
-
+    ##
+    # Disconnect our Snapcast listener
+    ##
     def snapcast_disconnect(self):
         if (self.snapcast_listener):
             self.snapcast_listener.close()
@@ -68,6 +84,8 @@ class IrisCore(object):
 
     ##
     # Handle a message from the Snapcast Telnet API
+    # We create a connection for this request, and then drop it once completed. This is because
+    # we have a separate socket for monitoring notifications
     #
     # @param data = string
     ##
@@ -87,6 +105,9 @@ class IrisCore(object):
 
     ## 
     # Send a request to Snapcast
+    #
+    # We create a connection for this request, and then drop it once completed. This is because
+    # we have a separate socket for monitoring notifications
     ##
     def snapcast_instruct(self, *args, **kwargs):
         callback = kwargs.get('callback', None)
diff --git a/mopidy_iris/frontend.py b/mopidy_iris/frontend.py
index 7ad55cf0..807c8fe6 100755
--- a/mopidy_iris/frontend.py
+++ b/mopidy_iris/frontend.py
@@ -20,11 +20,8 @@ class IrisFrontend(pykka.ThreadingActor, CoreListener):
         logger.info('Starting Iris '+mem.iris.version)
 
         #if mem.iris.config['iris']['snapcast_enabed']:
-        try:
-            mem.iris.snapcast_listener = mem.iris.new_snapcast_socket()
-            logger.info("Iris connected to Snapcast")
-        except e:
-            logger.error("Iris could not connect to Snapcast: %s" % e)
+        # Create our listening socket for Snapcast notifications
+        mem.iris.create_snapcast_listener()
 
     def on_stop(self):
         mem.iris.snapcast_disconnect()