UGI3974-4572

Enforced returns