[OE-2714] only execute the callback if it's passed.