fix an edge case null pointer
Merge pull request #156 from box/nullpointer

fix an edge case null pointer