Better error reporting.
Updated CHANGELOG.md