DIR8374-8737

Enforced returns