diff --git a/ChangeLog b/ChangeLog
index cff90b008..8ac0b9715 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-09-29  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoObject.m (SOGoSelectorForPropertyGetter)
+	(SOGoSelectorForPropertySetter): fixed a case where propSel should
+	be initialized to NULL.
+
 	* SoObjects/SOGo/SOGoGroup.m (-members): we now cache the array of
 	members as an ivar.
 	(-hasMemberWithUID): new self-explicit method.
diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m
index e508c6d9f..56c7e4840 100644
--- a/SoObjects/SOGo/SOGoObject.m
+++ b/SoObjects/SOGo/SOGoObject.m
@@ -96,6 +96,8 @@ SEL SOGoSelectorForPropertyGetter (NSString *property)
 	    [getterMap setObject: [NSValue valueWithPointer: propSel]
 		       forKey: property];
 	}
+      else
+        propSel = NULL;
     }
 
   return propSel;
@@ -124,6 +126,8 @@ SEL SOGoSelectorForPropertySetter (NSString *property)
 	    [setterMap setObject: [NSValue valueWithPointer: propSel]
 		       forKey: property];
 	}
+      else
+        propSel = NULL;
     }
 
   return propSel;