diff --git a/propan/__about__.py b/propan/__about__.py
index 93f9d53e..ae48acc3 100644
--- a/propan/__about__.py
+++ b/propan/__about__.py
@@ -2,7 +2,7 @@
 
 from unittest.mock import Mock
 
-__version__ = "0.1.5.14"
+__version__ = "0.1.5.15"
 
 
 INSTALL_MESSAGE = (
diff --git a/propan/_compat.py b/propan/_compat.py
index cce30116..14275d89 100644
--- a/propan/_compat.py
+++ b/propan/_compat.py
@@ -21,19 +21,19 @@ def is_installed(package: str) -> bool:
 
     if FASTAPI_V2:
         from fastapi._compat import _normalize_errors
-        from fastapi.exceptions import ResponseValidationError
+        from fastapi.exceptions import RequestValidationError
 
         def raise_fastapi_validation_error(errors: List[Any], body: AnyDict) -> Never:
-            raise ResponseValidationError(_normalize_errors(errors), body=body)
+            raise RequestValidationError(_normalize_errors(errors), body=body)
 
     else:
-        from pydantic import ValidationError as ResponseValidationError
+        from pydantic import ValidationError as RequestValidationError
         from pydantic import create_model
 
         ROUTER_VALIDATION_ERROR_MODEL = create_model("PropanRoute")
 
         def raise_fastapi_validation_error(errors: List[Any], body: AnyDict) -> Never:
-            raise ResponseValidationError(errors, ROUTER_VALIDATION_ERROR_MODEL)
+            raise RequestValidationError(errors, ROUTER_VALIDATION_ERROR_MODEL)
 
 
 if PYDANTIC_V2:
diff --git a/propan/brokers/rabbit/rabbit_broker.py b/propan/brokers/rabbit/rabbit_broker.py
index 5336ef4e..f18d507a 100644
--- a/propan/brokers/rabbit/rabbit_broker.py
+++ b/propan/brokers/rabbit/rabbit_broker.py
@@ -300,7 +300,7 @@ async def _parse_message(
             body=message.body,
             headers=message.headers,
             reply_to=message.reply_to or "",
-            message_id=message.message_id,
+            message_id=message.message_id or str(uuid4()),
             content_type=message.content_type or "",
             raw_message=message,
         )
diff --git a/tests/fastapi/test_base.py b/tests/fastapi/test_base.py
index 89eca6c8..a5cab60f 100644
--- a/tests/fastapi/test_base.py
+++ b/tests/fastapi/test_base.py
@@ -6,7 +6,7 @@
 from fastapi import Depends, FastAPI
 from fastapi.testclient import TestClient
 
-from propan._compat import ResponseValidationError
+from propan._compat import RequestValidationError
 from propan.fastapi import KafkaRouter
 from propan.test import TestKafkaBroker
 from propan.test.kafka import build_message
@@ -87,7 +87,7 @@ async def handler(a: int, b: str):
 
     msg = build_message("Hello", "test")
 
-    with pytest.raises(ResponseValidationError):
+    with pytest.raises(RequestValidationError):
         await handler(msg, reraise_exc=True)