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

* commit '73ffe0cc23dd094e720b947b4daefac90e98524b':
  Catch errors for unknown object types.