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

* commit 'df3c5056623ceed1f5b234cf57fce81be4570f3b':
  Add missing null check