Fix spacing.
Merge pull request #4762 from joychao/patch-3

Fix spacing.
Return null.
Merge branch '4.2'