am d1eec0de: am 876881b2: Merge "Add missing null checks after allocations."

* commit 'd1eec0de6a4af9565673809eb3cf29a1eefdcdb8':
  Add missing null checks after allocations.