diff --git a/app/Exceptions/Converters/GenericException.php b/app/Exceptions/Converters/GenericException.php
index 9f028102..d396a05c 100644
--- a/app/Exceptions/Converters/GenericException.php
+++ b/app/Exceptions/Converters/GenericException.php
@@ -40,9 +40,7 @@ class GenericException extends HttpException
     public function getErrorMetadata(): array
     {
         $metadata = [];
-        $metadata['error'] = [
-            'original_exception' => get_class($this->exception),
-        ];
+        $metadata['original_exception'] = get_class($this->exception);
 
         // Only add trace if in dev
         if (config('app.env') === 'dev') {
diff --git a/app/Exceptions/HttpException.php b/app/Exceptions/HttpException.php
index ed381bfe..2c223d0a 100644
--- a/app/Exceptions/HttpException.php
+++ b/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(),
-                [
-                    'content-type' => 'application/problem+json',
-                ]
+                $headers
             );
     }
 }