KRACOEUS-7315: Removing null checks since rice fixed the values finder