diff --git a/SoObjects/Contacts/SOGoContactSourceFolder.m b/SoObjects/Contacts/SOGoContactSourceFolder.m
index e31607f12..41fa9a3d0 100644
--- a/SoObjects/Contacts/SOGoContactSourceFolder.m
+++ b/SoObjects/Contacts/SOGoContactSourceFolder.m
@@ -527,12 +527,15 @@
   currentValue = values;
   while (*currentProperty)
     {
+      *values = nil;
       methodSel = SOGoSelectorForPropertyGetter (*currentProperty);
       if (methodSel && [ldifEntry respondsToSelector: methodSel])
-        *currentValue = [[ldifEntry performSelector: methodSel]
-                          safeStringByEscapingXMLString];
+        {
+          *currentValue = [[ldifEntry performSelector: methodSel]
+                            safeStringByEscapingXMLString];
+          currentValue++;
+        }
       currentProperty++;
-      currentValue++;
     }
 
 //    NSLog (@"/_properties:ofObject:: %@", [NSDate date]);