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

     }

     public function handle404($request){

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

-        echo "<pre>";

-        var_dump($request);

-        echo "</pre>";

-        throw new \Exception("Not implemented!");

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

+            $this->runAction($action);

+        }

+        else{

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

+            echo "<pre>";

+            var_dump($request);

+            echo "</pre>";

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

+        }

     }

     public function beforeAction(){

@@ -272,52 +277,56 @@ class Application{

         }

     }

-    public function run(){

-        // Check if routing path is found

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

-            // routing match found decide what to do next...

-            // BeforeAction event

-            $this->beforeAction();

+    public function runAction($action){

+        // routing match found decide what to do next...

+        // BeforeAction event

+        $this->beforeAction();

-            // function -> call it...

-            if(is_callable($action)){

-                $reflection = new \ReflectionFunction($action);

-                if($reflection->getNumberOfParameters()){

-                    $fire_args=array();

-      

-                    foreach($reflection->getParameters() AS $arg)

-                    {

-                        if(isset($this->router->parsedParameters[$arg->name]))

-                            $fire_args[$arg->name]=$this->router->parsedParameters[$arg->name];

-                        else

-                            $fire_args[$arg->name]=null;

-                    }

-                    

-                    $result = call_user_func_array($action, $fire_args);

-                }

-                else{

-                    $result = call_user_func($action);

+        // function -> call it...

+        if(is_callable($action)){

+            $reflection = new \ReflectionFunction($action);

+            if($reflection->getNumberOfParameters()){

+                $fire_args=array();

+    

+                foreach($reflection->getParameters() AS $arg)

+                {

+                    if(isset($this->router->parsedParameters[$arg->name]))

+                        $fire_args[$arg->name]=$this->router->parsedParameters[$arg->name];

+                    else

+                        $fire_args[$arg->name]=null;

                 }

-            }

-            else if(is_object($action) && is_a($action, 'L2_controler_info')){

-                // not implemented yet.

-                throw new \Exception("Not implemented!");

-                ///$action->runControlerAction($this->routing->param);

-            }

-            // array with controller, and action -> run the controller action

-            else if(is_array($action) && array_key_exists('controller',$action) && array_key_exists('action', $action)){

-                $result = $this->runControllerAction($action, $this->router->parsedParameters);

+                $result = call_user_func_array($action, $fire_args);

             }

-            // string

-            else if(is_string($action)){

-                $result = $action;

+            else{

+                $result = call_user_func($action);

             }

+        }

+        else if(is_object($action) && is_a($action, 'L2_controler_info')){

+            // not implemented yet.

+            throw new \Exception("Not implemented!");

+            ///$action->runControlerAction($this->routing->param);

+        }

+        // array with controller, and action -> run the controller action

+        else if(is_array($action) && array_key_exists('controller',$action) && array_key_exists('action', $action)){

+            $result = $this->runControllerAction($action, $this->router->parsedParameters);

+            

+        }

+        // string

+        else if(is_string($action)){

+            $result = $action;

+        }

-            // Handle the action result

-            if(isset($result)){

-                $this->handleActionResult($result);

-            }

+        // Handle the action result

+        if(isset($result)){

+            $this->handleActionResult($result);

+        }

+    }

+

+    public function run(){

+        // Check if routing path is found

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

+            $this->runAction($action);

         }

         // routing path not found -> generate 404 response

         else{

@@ -2,6 +2,7 @@

 namespace elanpl\L3;

+define('_L3_ROUTE_404_NAME', '_L3_404');

 class Router{

     protected $routes; // The defined routes collection

@@ -24,6 +25,10 @@ class Router{

         return $this;

     }

+    public function add404($result){

+        return $this->add('404', '', $result, _L3_ROUTE_404_NAME);

+    }

+

     public function get($path, $result, $name = ''){

         return $this->add('GET', $path, $result, $name);

     }

@@ -109,6 +114,28 @@ class Router{

         return false;

     }

+    public function getRouteInfo($name){

+        if(isset($this->routeNameIndex[$name]))

+            return $this->routeNameIndex[$name];

+        else

+            return false;

+    }

+

+    public function calculateRequestDepth($request){

+        return count(explode('/',trim($request->path, "/ \t\n\r\0\x0B")));

+    }

+

+    public function setMatch404($request){

+        if($routeInfo404 = $this->getRouteInfo(_L3_ROUTE_404_NAME)){

+            $this->depth = $this->calculateRequestDepth($request);

+            $this->routeInfo = $routeInfo404;

+            return $routeInfo404->result;

+        }

+        else{

+            return false;

+        }

+    }

+

     public function link($name, $parameters){

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

         $fields = array_keys($parameters);