am bffd4d43: Merge "Check return values for null." into klp-modular-dev

* commit 'bffd4d437d133164877c6a194d6a533299072fae':
  Check return values for null.