PHE4719-1496

Enforced returns