am da68124d: Merge "Defend against NPE." into klp-dev

* commit 'da68124da23acadc192ba996d0e64f6d362a9a26':
  Defend against NPE.