Added defensive code to EvaluatorRequestorImpl and a test