Slightly better error handling
Slightly better error handling

ehealthafrica-ci/formhub,eHealthAfrica/formhub,eHealthAfrica/formhub,ehealthafrica-ci/formhub,eHealthAfrica/formhub,eHealthAfrica/formhub,ehealthafrica-ci/formhub,ehealthafrica-ci/formhub