Made Argument Helper use validEntity.name() instead of validEntity.getName(), because the latter returns null for certain values.