Fixed error handling of ModelNotFoundException and PageNotFoundExcept…

…ion exceptions
johncms · Feb 5, 2024 · f57e3ca · f57e3ca
1 parent a1d74f9
commit f57e3ca
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/system/src/Router/RequestHandler.php b/system/src/Router/RequestHandler.php
@@ -47,15 +47,14 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             }
 
             $this->middlewareDispatcher->addMiddleware($this);
+            return $this->middlewareDispatcher->handle($request);
         } catch (ResourceNotFoundException) {
             return status_page(404);
         } catch (ModelNotFoundException $exception) {
             return status_page(404, message: $exception->getMessage());
         } catch (PageNotFoundException $exception) {
             return status_page(404, template: $exception->getTemplate(), title: $exception->getTitle(), message: $exception->getMessage());
         }
-
-        return $this->middlewareDispatcher->handle($request);
     }
 
     /**