Annotate possibly null return value
Merge pull request #1408 from maginatics/null-payload

Annotate possibly null return value