diff --git a/Sources/OpenAPIRuntime/Conversion/Converter+Common.swift b/Sources/OpenAPIRuntime/Conversion/Converter+Common.swift
index dc908e75..73f8fecb 100644
--- a/Sources/OpenAPIRuntime/Conversion/Converter+Common.swift
+++ b/Sources/OpenAPIRuntime/Conversion/Converter+Common.swift
@@ -61,7 +61,12 @@ extension Converter {
         // The force unwrap is safe, we only get here if the array is not empty.
         let bestOption = evaluatedOptions.max { a, b in a.match.score < b.match.score }!
         let bestContentType = bestOption.contentType
-        if case .incompatible = bestOption.match { throw RuntimeError.unexpectedContentTypeHeader(bestContentType) }
+        if case .incompatible = bestOption.match {
+            throw RuntimeError.unexpectedContentTypeHeader(
+                expected: bestContentType,
+                received: String(describing: received)
+            )
+        }
         return bestContentType
     }
 
diff --git a/Sources/OpenAPIRuntime/Errors/RuntimeError.swift b/Sources/OpenAPIRuntime/Errors/RuntimeError.swift
index f3c21db9..b0c776ed 100644
--- a/Sources/OpenAPIRuntime/Errors/RuntimeError.swift
+++ b/Sources/OpenAPIRuntime/Errors/RuntimeError.swift
@@ -37,7 +37,7 @@ internal enum RuntimeError: Error, CustomStringConvertible, LocalizedError, Pret
 
     // Headers
     case missingRequiredHeaderField(String)
-    case unexpectedContentTypeHeader(String)
+    case unexpectedContentTypeHeader(expected: String, received: String)
     case unexpectedAcceptHeader(String)
     case malformedAcceptHeader(String)
     case missingOrMalformedContentDispositionName
@@ -95,7 +95,8 @@ internal enum RuntimeError: Error, CustomStringConvertible, LocalizedError, Pret
             return
                 "Unsupported parameter style, parameter name: '\(name)', kind: \(location), style: \(style), explode: \(explode)"
         case .missingRequiredHeaderField(let name): return "The required header field named '\(name)' is missing."
-        case .unexpectedContentTypeHeader(let contentType): return "Unexpected Content-Type header: \(contentType)"
+        case .unexpectedContentTypeHeader(expected: let expected, received: let received):
+            return "Unexpected content type, expected: \(expected), received: \(received)"
         case .unexpectedAcceptHeader(let accept): return "Unexpected Accept header: \(accept)"
         case .malformedAcceptHeader(let accept): return "Malformed Accept header: \(accept)"
         case .missingOrMalformedContentDispositionName:
diff --git a/Tests/OpenAPIRuntimeTests/Conversion/Test_Converter+Common.swift b/Tests/OpenAPIRuntimeTests/Conversion/Test_Converter+Common.swift
index 925ebf4f..e82b12ab 100644
--- a/Tests/OpenAPIRuntimeTests/Conversion/Test_Converter+Common.swift
+++ b/Tests/OpenAPIRuntimeTests/Conversion/Test_Converter+Common.swift
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 import XCTest
-@_spi(Generated) import OpenAPIRuntime
+@testable @_spi(Generated) import OpenAPIRuntime
 import HTTPTypes
 
 extension HTTPField.Name { static var foo: Self { Self("foo")! } }
@@ -84,7 +84,16 @@ final class Test_CommonConverterExtensions: Test_Runtime {
         try testCase(received: "image/png", options: ["image/*", "*/*"], expected: "image/*")
         XCTAssertThrowsError(
             try testCase(received: "text/csv", options: ["text/html", "application/json"], expected: "-")
-        )
+        ) { error in
+            XCTAssert(error is RuntimeError)
+            guard let error = error as? RuntimeError,
+                case .unexpectedContentTypeHeader(expected: let expected, received: let received) = error,
+                expected == "text/html", received == "text/csv"
+            else {
+                XCTFail("Unexpected error: \(error)")
+                return
+            }
+        }
     }
 
     func testVerifyContentTypeIfPresent() throws {