SQE2527-8979

Enforced returns