Improved error handling
Bumped the version