am 2fe1530c: Fix NPE

* commit '2fe1530ce9ab8c8a48aed7df62c771e774df23a7':
  Fix NPE