[OE-2909] Port ward exceptions from 1.2