Improve error handling
Release 1.1.1