NBH2091-1156

Enforced returns