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