@@ -234,15 +234,16 @@ class Application{

     }

     public function handle404($request){

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

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

             $this->runAction($action);

         }

         else{

-            echo "Resource not found!<br>".PHP_EOL;

+            http_response_code(404);

+            echo "<h1>Resource not found!</h1><br>".PHP_EOL;

             echo "<pre>";

             var_dump($request);

             echo "</pre>";

-            if(isset($this->router->routeInfo))

+            if($this->router->is_Match404())

                 throw new \Exception("The 404 controller or action not found!");

             else

                 throw new \Exception("The 404 (not found) route not set!");

@@ -136,6 +136,10 @@ class Router{

         }

     }

+    public function is_Match404(){

+        return isset($this->routeInfo) && ($this->routeInfo->name === _L3_ROUTE_404_NAME);

+    }

+

     public function link($name, $parameters){

         $route = $this->routeNameIndex[$name];

         $fields = array_keys($parameters);