Improved error message handling
v1.1.1