cleaner exception handling
Merge pull request #90 from dimagi/cz

cleaner exception handling