am 740da0d8: Fix an NPE

* commit '740da0d8d0b29297fba75f4b63ccff28fc1f4a14':
  Fix an NPE