Modify error handling
Bump version