WIP trying to improve error reporting on FileNotFound.