diff --git a/setup_consumer.go b/setup_consumer.go
index 770dfeb..2fde4d3 100644
--- a/setup_consumer.go
+++ b/setup_consumer.go
@@ -56,7 +56,7 @@ func TypeMappingHandler(handler Handler) EventHandler[json.RawMessage] {
 			return ErrNoMessageTypeForRouteKey
 		}
 		if err := json.Unmarshal(event.Payload, &message); err != nil {
-			return err
+			return fmt.Errorf("%v: %w", err, ErrParseJSON)
 		}
 		msg := ConsumableEvent[any]{
 			Metadata:     event.Metadata,
diff --git a/setup_consumer_test.go b/setup_consumer_test.go
index 3d0bf55..9d8f2fd 100644
--- a/setup_consumer_test.go
+++ b/setup_consumer_test.go
@@ -232,7 +232,7 @@ func Test_TypeMappingHandler(t *testing.T) {
 				},
 			},
 			wantErr: func(t assert.TestingT, err error, i ...interface{}) bool {
-				return assert.EqualError(t, err, "unexpected end of JSON input")
+				return assert.ErrorContains(t, err, "unexpected end of JSON input")
 			},
 		},
 		{