Nil safety check.
Merge pull request #38 from wdn/master

Nil safety check.