am d6aa6177: am 008b2de6: Add additional field checks for deserialization.

* commit 'd6aa6177c90a84620e79b65009129c985b1913d4':
  Add additional field checks for deserialization.