JPF4542-2117

Enforced returns