CRM-14091, CRM-14092 - More caution