am ab10f3c5: Merge "Restore a mistakenly-removed null check"

* commit 'ab10f3c5b939f3d7afe6d5561d761fc5299572bc':
  Restore a mistakenly-removed null check