am c60498a9: Fix NPE

* commit 'c60498a91d82ca7d73402d5a5dd8467cd7e0391c':
  Fix NPE