diff --git a/lib/action.php b/lib/action.php
index a9cc99221d..fa91d46726 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -125,11 +125,10 @@ class Action extends HTMLOutputter // lawsuit
             } else {
                 common_debug('Prepare failed for Action.');
             }
+
+            $this->flush();
+            Event::handle('EndActionExecute', array($this));
         }
-
-        $this->flush();
-
-        Event::handle('EndActionExecute', array($this));
     }
 
     /**