NGS4868-1759

Enforced returns