NNI6574-3805

Enforced returns