Add some error handling
Update version number