Enhancing the evaluation error handling