Add better error handling
Bump version