CF-147: Fix fatal errors on agenda/e/add