am 339004b1: Fix NPE in unit test

* commit '339004b1d81b34682ef56f6ea0b3b9fccc133753':
  Fix NPE in unit test