am 2188cbae: Merge "Fix an NPE"

* commit '2188cbae6351ae463f8b882b1cb6b1b348fad0a2':
  Fix an NPE