am dedad7c5: Merge "Add null check" into honeycomb-mr1

* commit 'dedad7c599e2a27b8176bc128734ec1ba2edbfc2':
  Add null check