Context Fix relating to partners being deleted in email patch.