am 6743c171: am 635892fe: Merge "Guard against NPE when using existing process." into klp-dev

* commit '6743c1712e1051ae99639a7d90912c54a0be8b24':
  Guard against NPE when using existing process.