Tighter null checks
Merge pull request #9 from mpath/null_0_handler

Tighter null checks