Merge "Catch errors for unknown object types."