JGI8099-7840

Enforced returns