am 2cf1cf09: Fix possible NPE

* commit '2cf1cf098513807ffd3420ae106f438e943d0cd8':
  Fix possible NPE