more error handling
more error handling

clinwiki-org/clinwiki,clinwiki-org/clinwiki,tibbs001/clinwiki-1,clinwiki-org/clinwiki,tibbs001/clinwiki-1,clinwiki-org/clinwiki,tibbs001/clinwiki-1,clinwiki-org/clinwiki