diff --git a/src/main/kotlin/space/mori/dnsapi/GlobalExceptionHandler.kt b/src/main/kotlin/space/mori/dnsapi/GlobalExceptionHandler.kt
index ea94a62..294096c 100644
--- a/src/main/kotlin/space/mori/dnsapi/GlobalExceptionHandler.kt
+++ b/src/main/kotlin/space/mori/dnsapi/GlobalExceptionHandler.kt
@@ -12,7 +12,7 @@ class GlobalExceptionHandler {
     @ExceptionHandler(PowerDNSAPIException::class)
     fun handlePowerDNSAPIException(ex: PowerDNSAPIException): ResponseEntity<ApiResponseDTO<Nothing>> {
         var idx = 0
-        val errors = mutableListOf(ErrorOrMessage(idx, ex.message ?: ""))
+        val errors = mutableListOf(ErrorOrMessage(idx, ex.message ?: "PowerDNSAPIException"))
         ex.errors?.forEach{
             errors.add(ErrorOrMessage(idx++, it))
         }
@@ -25,4 +25,17 @@ class GlobalExceptionHandler {
 
         return ResponseEntity.status(HttpStatus.EXPECTATION_FAILED).body(response)
     }
+
+    @ExceptionHandler(Throwable::class)
+    fun handleException(ex: Throwable): ResponseEntity<ApiResponseDTO<Nothing>> {
+        val errors = mutableListOf(ErrorOrMessage(0, ex.message ?: "Error"))
+
+        val response = ApiResponseDTO(
+            success = false,
+            errors = errors,
+            result = null
+        )
+
+        return ResponseEntity.status(HttpStatus.EXPECTATION_FAILED).body(response)
+    }
 }
\ No newline at end of file