Improve error reporting for evaluator

This makes several error reporting improvements to the evaluator for #392.