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

* commit 'd641bb009912818a1eb68bb46bfaf3af08318ea7':
  Catch errors for unknown object types.