am 98dcbbc1: am df3c5056: Merge "Add missing null check" into honeycomb

* commit '98dcbbc1d930daad5642a329f2ddc59c8d956c02':
  Add missing null check