Merge "Defend against NPE." into klp-dev