Restore null safe behavior after GEOT-4538 changes