JDP0438-2426

Enforced returns