Improved error handling.
Release v2.0.1