improved performance for evaluation error handling;