Restore of broke version that was throwing Exception into the AgendaAdapter.