Improved error handling
Version bump