am d6dd7c8a: Fix NPE

* commit 'd6dd7c8a21e416d7c118517569a242ac7de6c696':
  Fix NPE