[OE-3539] better error trapping