calendarIdentifier==nil protection in state restoration