@@ -248,8 +248,11 @@ class Application{

     }

     public function handle404($request){

+        if(!isset($request)){

+            $request = $this->request;

+        }

         if(!$this->router->is_Match404() && ($action = $this->router->setMatch404($request))){

-            $this->runAction($action);

+            return $this->runAction($action);

         }

         else{

             http_response_code(404);

@@ -340,21 +343,21 @@ class Application{

             $result = $action;

         }

-        // Handle the action result

-        if(isset($result)){

-            $this->handleActionResult($result);

-        }

+        return isset($result) ? $result : null;

     }

     public function run(){

         // Check if routing path is found

         if($action = $this->router->match($this->request)){

-            $this->runAction($action);

+            $result = $this->runAction($action);

         }

         // routing path not found -> generate 404 response

         else{

-            $this->handle404($this->request);

+            $result = $this->handle404($this->request);

+        }

+        // Handle the action result

+        if(isset($result)){

+            $this->handleActionResult($result);

         }

- 

     }

 }

\ No newline at end of file