Check for None a couple places
Merge pull request #4 from chazomaticus/master

Check for None a couple places