clean up error handling
version 0.0.3