-improving error reporting on #2295