simplify null guard
Merge pull request #19 from davidchambers/guard

simplify null guard