am c814031b: am aa01c088: am ffc2682a: Fix NPE

* commit 'c814031b354c7e8c44ef55c301d4ff1242a04d12':
  Fix NPE