diff --git a/ChangeLog b/ChangeLog
index 62fa79aac..f8bf5b79a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-05-10  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/AgenorUserDefaults.m ([AgenorUserDefaults
+	-primaryFetchProfile]): check that the value returned is not null
+	before interpreting it.
+
 	* SoObjects/SOGo/LDAPUserManager.m ([LDAPUserManager
 	-contactInfosForUserWithUIDorEmail:uid]): check that uid is not empty.
 	([LDAPUserManager -_fillContactMailRecords:contact]): if the
diff --git a/SoObjects/SOGo/AgenorUserDefaults.m b/SoObjects/SOGo/AgenorUserDefaults.m
index 1b377f1ae..e7031c7c7 100644
--- a/SoObjects/SOGo/AgenorUserDefaults.m
+++ b/SoObjects/SOGo/AgenorUserDefaults.m
@@ -104,12 +104,11 @@ static NSString *uidColumnName = @"uid";
 {
   GCSChannelManager *cm;
   EOAdaptorChannel *channel;
-  NSDictionary *row, *oldValues;
+  NSDictionary *row;
   NSException *ex;
-  NSString *sql;
+  NSString *sql, *value;
   NSArray *attrs;
   BOOL rc;
-  id column;
 
   rc = NO;
   
@@ -143,12 +142,9 @@ static NSString *uidColumnName = @"uid";
 	  [channel cancelFetch];
   
 	  /* remember values */
-	  column = [row objectForKey: fieldName];
-	  if ([column isNotNull])
-	    {
-	      oldValues = [column propertyList];
-	      [values setDictionary: oldValues];
-	    }
+	  value = [row objectForKey: fieldName];
+	  if ([value isNotNull])
+	    [values setDictionary: [value propertyList]];
 
 	  ASSIGN (lastFetch, [NSCalendarDate date]);
 	  defFlags.modified = NO;