Silence a few "zero as null pointer" warnings.
Merge pull request #1588 from rohit-n/zero-nullptr

Silence a few "zero as null pointer" warnings.