Carry headers through the handler

app/Exceptions/Converters/GenericException.php

@@ -40,9 +40,7 @@ class GenericException extends HttpException
     public function getErrorMetadata(): array
     {
         $metadata = [];
-        $metadata['error'] = [
+        $metadata['original_exception'] = get_class($this->exception);
-            'original_exception' => get_class($this->exception),
-        ];
 
         // Only add trace if in dev
         if (config('app.env') === 'dev') {

app/Exceptions/HttpException.php

@@ -49,13 +49,15 @@ abstract class HttpException extends SymfonyHttpException
      */
     public function getResponse()
     {
+        $headers = [];
+        $headers['content-type'] = 'application/problem+json';
+        $headers = array_merge($headers, $this->getHeaders());
+
         return response()
             ->json(
                 $this->getJson(),
                 $this->getStatusCode(),
-                [
+                $headers
-                    'content-type' => 'application/problem+json',
-                ]
             );
     }
 }