am b68e03a8: Fix NPE

* commit 'b68e03a83cfc8e59c0c93d070c5e3cc13cc2996b':
  Fix NPE