Improve error messages (#45)