Add Todos for exception handling, pending outcome of CRM-15022.