Remove errors dependency, improve error messages