clean up error handling and tests
bump