Avoid NPE when no value is found
Update to match CHAOS API change