am 9959140f: Merge "Fix an NPE."

* commit '9959140f15edcb32c21406e3cff80ad6856e83c9':
  Fix an NPE.