Merge "Guard against NPE when using existing process." into klp-dev