Added metrics to evaluator.
Avoiding NPEs