SYS6844-2257

Enforced returns