am aa671a84: am 2fe1530c: Fix NPE

* commit 'aa671a8465ea3f113ac3efcae8214c32e04f79cd':
  Fix NPE