WAF9958-7307

Enforced returns