diff --git a/src/main/java/com/cloverta/webapi/controller/CustomErrorController.java b/src/main/java/com/cloverta/webapi/controller/CustomErrorController.java
new file mode 100644
index 0000000..592459f
--- /dev/null
+++ b/src/main/java/com/cloverta/webapi/controller/CustomErrorController.java
@@ -0,0 +1,14 @@
+package com.cloverta.webapi.controller;
+
+import com.cloverta.webapi.restservice.Error;
+import org.springframework.boot.web.servlet.error.ErrorController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class CustomErrorController implements ErrorController {
+    @RequestMapping("/error")
+    public Error error() {
+        return new Error("ERROR", "Something went wrong... I hope it wasn't my fault.");
+    }
+}
diff --git a/src/main/java/com/cloverta/webapi/restservice/Error.java b/src/main/java/com/cloverta/webapi/restservice/Error.java
new file mode 100644
index 0000000..8ff7890
--- /dev/null
+++ b/src/main/java/com/cloverta/webapi/restservice/Error.java
@@ -0,0 +1,4 @@
+package com.cloverta.webapi.restservice;
+
+public record Error(String status, String message) {
+}