diff --git a/src/Controller/InstanceController.php b/src/Controller/InstanceController.php
index 306afe9..07e8f3d 100644
--- a/src/Controller/InstanceController.php
+++ b/src/Controller/InstanceController.php
@@ -6,11 +6,8 @@
 use AlexMorbo\React\Trassir\Router\Router;
 use AlexMorbo\React\Trassir\Traits\DBTrait;
 use AlexMorbo\React\Trassir\TrassirHelper;
-use AlexMorbo\Trassir\TrassirException;
 use Clue\React\SQLite\DatabaseInterface;
-use Exception;
 use Fig\Http\Message\StatusCodeInterface;
-use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Log\LoggerInterface;
 use React\Http\Message\Response;
diff --git a/src/Server.php b/src/Server.php
index 87693b9..a7f7c56 100644
--- a/src/Server.php
+++ b/src/Server.php
@@ -6,6 +6,7 @@
 use AlexMorbo\React\Trassir\Controller\InfoController;
 use AlexMorbo\React\Trassir\Controller\InstanceController;
 use AlexMorbo\React\Trassir\Router\Router;
+use AlexMorbo\Trassir\TrassirException;
 use Clue\React\SQLite\DatabaseInterface;
 use Clue\React\SQLite\Factory;
 use Exception;
@@ -147,7 +148,7 @@ function (ServerRequestInterface $request) use ($router) {
 
                         return $response;
                     })
-                    ->catch(function (NotFoundHttpException $e) {
+                    ->catch(function (NotFoundHttpException|TrassirException $e) {
                         return Response::json([
                             'status' => 'error',
                             'error' => $e->getMessage(),