Validate them sad cases, boom!
Merge pull request #27 from mattmakesmaps/develop

Merge of develop.