Related #51 - [x] Check we have no bare excepts - [ ] Update doc strings with what exceptions are thrown