better error handling
Merge pull request #116 from dimagi/misc-malawi

better error handling