JMX0939-8638

Enforced returns