am 9b25b77f: am d641bb00: am 73ffe0cc: Merge "Catch errors for unknown object types."

* commit '9b25b77feb09119710713a81978dbbcdcb2f0c40':
  Catch errors for unknown object types.