am fe537b3f: am 0e3fccf1: Merge change Icef599ec into eclair-mr2

Merge commit 'fe537b3fe4145e3cec41b70b93c366e1c2307ed5'

* commit 'fe537b3fe4145e3cec41b70b93c366e1c2307ed5':
  null check