am 98aeca38: Prevent NPE

* commit '98aeca3818c3b696f304c1bfb5657a1e1f277a04':
  Prevent NPE