diff --git a/api.php b/api.php
index d18a5a8..979d8cd 100644
--- a/api.php
+++ b/api.php
@@ -21,6 +21,7 @@ $api->pipe($app->make('Flarum\Api\Middleware\LoginWithHeader'));
$api->pipe('/api', $app->make('Flarum\Http\RouterMiddleware', ['routes' => $app->make('flarum.api.routes')]));
+// Handle errors
if (Core::inDebugMode()) {
$api->pipe(new \Franzl\Middleware\Whoops\Middleware());
} else {
diff --git a/index.php b/index.php
index 0068614..f5b0072 100644
--- a/index.php
+++ b/index.php
@@ -1,5 +1,6 @@
pipe($app->make('Flarum\Forum\Middleware\LoginWithCookie'));
$flarum->pipe($app->make('Flarum\Api\Middleware\ReadJsonParameters'));
$flarum->pipe('/', $app->make('Flarum\Http\RouterMiddleware', ['routes' => $app->make('flarum.forum.routes')]));
-$flarum->pipe(new \Franzl\Middleware\Whoops\Middleware());
+
+// Handle errors
+if (Core::inDebugMode()) {
+ $flarum->pipe(new \Franzl\Middleware\Whoops\Middleware());
+} else {
+ $flarum->pipe(new \Flarum\Forum\Middleware\HandleErrors(base_path('error')));
+}
$server = Server::createServer(
$flarum,
diff --git a/system/error/404.html b/system/error/404.html
new file mode 100644
index 0000000..262b809
--- /dev/null
+++ b/system/error/404.html
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+404 Not Found
+Looks like this page could not be found.
+
+
+
\ No newline at end of file
diff --git a/system/error/500.html b/system/error/500.html
new file mode 100644
index 0000000..873fddb
--- /dev/null
+++ b/system/error/500.html
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+500 Internal Server Error
+Something went wrong on our server.
+
+
+
\ No newline at end of file