Better handling of errors and cleanup
Update CHANGELOG
Bump version