Move exception catching to Evaluator