EXC5784-1591

Enforced returns