improving error reporting in deserialization
Merge commit '06bc873' into phoenix