improve error handling
Release 0.1.7