NAI7045-6568

Enforced returns