Improve error reporting on missing predicates
2 files changed