Update version
Add error handling back in