Improve error reporting on #4