JHR3988-2179

Enforced returns