am 008b2de6: Add additional field checks for deserialization.

* commit '008b2de6760bc98b9651bb0e97e45ea76c22f65b':
  Add additional field checks for deserialization.