diff --git a/sylk/applications/__init__.py b/sylk/applications/__init__.py
index c92e822..0734ecf 100644
--- a/sylk/applications/__init__.py
+++ b/sylk/applications/__init__.py
@@ -1,145 +1,151 @@
 # Copyright (C) 2010-2011 AG Projects. See LICENSE for details
 #
 
 __all__ = ['ISylkApplication', 'ApplicationRegistry', 'sylk_application', 'IncomingRequestHandler']
 
 import os
 
 from application import log
 from application.notification import IObserver, NotificationCenter
 from application.python.util import Null, Singleton
 from sipsimple.threading import run_in_twisted_thread
 from zope.interface import Attribute, Interface, implements
 
 from sylk.configuration import ServerConfig
 
 
 class ISylkApplication(Interface):
     """
     Interface defining attributes and methods any application must 
     implement.
 
     Each application must be a Singleton and has to be decorated with
     the @sylk_application decorator.
     """
 
     __appname__ = Attribute("Application name")
 
     def incoming_session(self, session):
         pass
 
     def incoming_subscription(self, subscribe_request, data):
         pass
 
     def incoming_referral(self, refer_request, data):
         pass
 
     def incoming_sip_message(self, message_request, data):
         pass
 
 
 class ApplicationRegistry(object):
     __metaclass__ = Singleton
 
     def __init__(self):
         self.applications = []
 
     def __iter__(self):
         return iter(self.applications)
 
     def add(self, app):
         if app not in self.applications:
             self.applications.append(app)
 
 
 def sylk_application(cls):
     """Class decorator for adding applications to the ApplicationRegistry"""
     ApplicationRegistry().add(cls())
     return cls
 
 
 def load_applications():
     toplevel = os.path.dirname(__file__)
     app_list = ['sylk.applications.%s' % item for item in os.listdir(toplevel) if os.path.isdir(os.path.join(toplevel, item)) and '__init__.py' in os.listdir(os.path.join(toplevel, item))]
     map(__import__, app_list)
 
 
+class ApplicationNotLoadedError(Exception):
+    pass
+
 class IncomingRequestHandler(object):
     """
     Handle incoming requests and match them to applications.
     """
     __metaclass__ = Singleton
     implements(IObserver)
 
-    # TODO: implement a 'find_application' function which will get the appropriate application
-    # as defined in the configuration
     # TODO: apply ACLs (before or after?)
     def __init__(self):
         load_applications()
         log.msg('Loaded applications: %s' % ', '.join([app.__appname__ for app in ApplicationRegistry()]))
         self.application_map = dict((item.split(':')) for item in ServerConfig.application_map)
 
     def start(self):
         notification_center = NotificationCenter()
         notification_center.add_observer(self, name='SIPSessionNewIncoming')
         notification_center.add_observer(self, name='SIPIncomingSubscriptionGotSubscribe')
         notification_center.add_observer(self, name='SIPIncomingReferralGotRefer')
         notification_center.add_observer(self, name='SIPIncomingRequestGotRequest')
 
     def stop(self):
         notification_center = NotificationCenter()
         notification_center.remove_observer(self, name='SIPSessionNewIncoming')
         notification_center.remove_observer(self, name='SIPIncomingSubscriptionGotSubscribe')
         notification_center.remove_observer(self, name='SIPIncomingReferralGotRefer')
         notification_center.remove_observer(self, name='SIPIncomingRequestGotRequest')
 
+    def get_application(self, uri):
+        application = self.application_map.get(uri.user, ServerConfig.default_application)
+        try:
+            app = (app for app in ApplicationRegistry() if app.__appname__ == application).next()
+        except StopIteration:
+            log.error('Application %s is not loaded' % application)
+            raise ApplicationNotLoadedError
+        else:
+            return app
+
     @run_in_twisted_thread
     def handle_notification(self, notification):
         handler = getattr(self, '_NH_%s' % notification.name, Null)
         handler(notification)
 
     def _NH_SIPSessionNewIncoming(self, notification):
         session = notification.sender
-        application = self.application_map.get(session._invitation.request_uri.user, ServerConfig.default_application)
         try:
-            app = (app for app in ApplicationRegistry() if app.__appname__ == application).next()
-        except StopIteration:
-            log.error('Application %s is not loaded' % application)
+            app = self.get_application(session._invitation.request_uri)
+        except ApplicationNotLoadedError:
+            pass
         else:
             app.incoming_session(session)
 
     def _NH_SIPIncomingSubscriptionGotSubscribe(self, notification):
         subscribe_request = notification.sender
-        application = self.application_map.get(notification.data.request_uri.user, ServerConfig.default_application)
         try:
-            app = (app for app in ApplicationRegistry() if app.__appname__ == application).next()
-        except StopIteration:
-            log.error('Application %s is not loaded' % application)
+            app = self.get_application(notification.data.request_uri)
+        except ApplicationNotLoadedError:
+            pass
         else:
             app.incoming_subscription(subscribe_request, notification.data)
 
     def _NH_SIPIncomingReferralGotRefer(self, notification):
         refer_request = notification.sender
-        application = self.application_map.get(notification.data.request_uri.user, ServerConfig.default_application)
         try:
-            app = (app for app in ApplicationRegistry() if app.__appname__ == application).next()
-        except StopIteration:
-            log.error('Application %s is not loaded' % application)
+            app = self.get_application(notification.data.request_uri)
+        except ApplicationNotLoadedError:
+            pass
         else:
             app.incoming_referral(refer_request, notification.data)
 
     def _NH_SIPIncomingRequestGotRequest(self, notification):
         request = notification.sender
         if notification.data.method != 'MESSAGE':
             request.answer(405)
             return
-        application = self.application_map.get(notification.data.request_uri.user, ServerConfig.default_application)
         try:
-            app = (app for app in ApplicationRegistry() if app.__appname__ == application).next()
-        except StopIteration:
-            log.error('Application %s is not loaded' % application)
+            app = self.get_application(notification.data.request_uri)
+        except ApplicationNotLoadedError:
+            pass
         else:
             app.incoming_sip_message(request, notification.data)
 
 
-