am e8debfcf: am c6fb7a5e: Merge "Exit early if the we encounter a null reference." into gingerbread

Merge commit 'e8debfcf2d16ba18474ca51200e9b7f2d912dee3'

* commit 'e8debfcf2d16ba18474ca51200e9b7f2d912dee3':
  Exit early if the we encounter a null reference.