Merge "Add null check and fix API reference"