add UUID into decoding errors

Do best effort to preserve the UUID.