am e8794a54: am 3e455284: Fix NPE

* commit 'e8794a54794320547db5d608b5167be4bf05e315':
  Fix NPE