Improved error handling
v0.1.4