PHE2168-2950

Enforced returns