diff --git a/ChangeLog b/ChangeLog
index b8f911012..19948e393 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-03-16  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Appointments/SOGoCalendarComponent.m
+	([SOGoCalendarComponent
+	-lookupName:lookupNameinContext:localContextacquire:acquire]):
+	initialize "isNewComponent" to NO if it's not, to avoid problems
+	with unitialized memory.
+
 	* SoObjects/SOGo/LDAPSource.m ([LDAPSource
 	-setBaseDN:newBaseDNIDField:newIDFieldCNField:newCNFieldUIDField:newUIDFieldmailFields:newMailFieldsandBindFields:newBindFields]):
 	bug setting the CN and UID field only if they were set before,
diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m
index 887cc4105..ebf898b73 100644
--- a/SoObjects/Appointments/SOGoCalendarComponent.m
+++ b/SoObjects/Appointments/SOGoCalendarComponent.m
@@ -319,7 +319,9 @@ _occurenceHasID (iCalRepeatableEntityObject *occurence, NSString *recID)
 	{
 	  recID = [lookupName substringFromIndex: 9];
 	  occurence = [self lookupOccurence: recID];
-	  if (!occurence)
+	  if (occurence)
+	    isNewOccurence = NO;
+	  else
 	    {
 	      occurence = [self newOccurenceWithID: recID];
 	      isNewOccurence = YES;