BUGFIX adding some != null checks in CalendarManager