am aa01c088: am ffc2682a: Fix NPE

* commit 'aa01c0882b8fcab73550546602b174bb36f72bce':
  Fix NPE