WAI6412-3630

Enforced returns