am e5831979: Missing null check

* commit 'e58319791de1e47db1d6d3c6565f03a5f775a9cb':
  Missing null check