am 9160410e: am eb91462f: am d6dd7c8a: Fix NPE

* commit '9160410e40c8e060a7012a35b38f2532fa159084':
  Fix NPE