Bug Fix: Dealing with null evaluationMethods