diff --git a/flight/core/EventDispatcher.php b/flight/core/EventDispatcher.php
index 3476192..cf361ca 100644
--- a/flight/core/EventDispatcher.php
+++ b/flight/core/EventDispatcher.php
@@ -34,13 +34,15 @@ class EventDispatcher
     {
         $listenerReturnValue = null;
 
-        if (isset($this->listeners[$event])) {
-            foreach ($this->listeners[$event] as $listener) {
-                $listenerReturnValue = $listener(...$args);
+        if (!isset($this->listeners[$event])) {
+            return null;
+        }
+
+        foreach ($this->listeners[$event] as $listener) {
+            $listenerReturnValue = $listener(...$args);
 
-                if ($listenerReturnValue === false) {
-                    break;
-                }
+            if ($listenerReturnValue === false) {
+                break;
             }
         }