@@ -234,7 +234,7 @@ class Application{

     }

     public function handle404($request){

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

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

             $this->runAction($action);

         }

         else{

@@ -242,7 +242,10 @@ class Application{

             echo "<pre>";

             var_dump($request);

             echo "</pre>";

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

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

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

+            else

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

         }

     }