Fix Thrown Exception: changes in calendar, event and diagnostic service