RYI8890-1156

Enforced returns