BUP4272-4198

Enforced returns