diff --git a/couchpotato/core/event.py b/couchpotato/core/event.py
index 88c15454..7192d39c 100644
--- a/couchpotato/core/event.py
+++ b/couchpotato/core/event.py
@@ -19,7 +19,7 @@ def addEvent(name, handler, priority = 100):
     if events.get(name):
         e = events[name]
     else:
-        e = events[name] = Event(threads = 20, exc_info = True, traceback = True, lock = threading.RLock())
+        e = events[name] = Event(name = name, threads = 20, exc_info = True, traceback = True, lock = threading.RLock())
 
     def createHandle(*args, **kwargs):
 
@@ -42,6 +42,8 @@ def removeEvent(name, handler):
     e -= handler
 
 def fireEvent(name, *args, **kwargs):
+    if not events.get(name): return
+    log.debug('Firing event %s' % name)
     try:
 
         # Fire after event
diff --git a/libs/axl/axel.py b/libs/axl/axel.py
index 5607450d..0ab8ce32 100644
--- a/libs/axl/axel.py
+++ b/libs/axl/axel.py
@@ -56,7 +56,7 @@ class Event(object):
     >> None
     """
 
-    def __init__(self, sender = None, asynch = False, exc_info = False,
+    def __init__(self, name = None, sender = None, asynch = False, exc_info = False,
                  lock = None, threads = 3, traceback = False):
         """ Creates an event
 
@@ -96,6 +96,7 @@ class Event(object):
             )
         """
         self.in_order = False
+        self.name = name
         self.asynchronous = asynch
         self.exc_info = exc_info
         self.lock = lock