Fix error handling
Bump version