diff --git a/src/judas_protocol/message.py b/src/judas_protocol/message.py
index 59d51a6..cb6ef35 100644
--- a/src/judas_protocol/message.py
+++ b/src/judas_protocol/message.py
@@ -87,7 +87,12 @@ class Message:
         Returns:
             Message: The created message.
         """
-        return cls.from_dict(json.loads(data))
+        try:
+            json_data = json.loads(data)
+        except json.JSONDecodeError as e:
+            raise ValueError("Invalid JSON data") from e
+
+        return cls.from_dict(json_data)
 
     @classmethod
     def from_bytes(cls, data: bytes) -> Message: