diff --git a/ChangeLog b/ChangeLog
index 3b247b292..b61b52da0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-22  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+        * Updated the documentation for the Invisible -> Flagged
+	mail column change.
+	* SoObjects/Contacts/NGVCard+SOGo.m - better error-handling. 
+
 2009-09-22  Cyril Robert <crobert@inverse.ca>
 
 	* UI/Scheduler/UIxCalFolderActions.m (exportAction): Used bareFetchFields from
diff --git a/Documentation/SOGo Installation Guide.odt b/Documentation/SOGo Installation Guide.odt
index 1a451c67a..2e589ebb9 100644
Binary files a/Documentation/SOGo Installation Guide.odt and b/Documentation/SOGo Installation Guide.odt differ
diff --git a/SoObjects/Contacts/NGVCard+SOGo.m b/SoObjects/Contacts/NGVCard+SOGo.m
index 85a37b8f4..1e73e0b00 100644
--- a/SoObjects/Contacts/NGVCard+SOGo.m
+++ b/SoObjects/Contacts/NGVCard+SOGo.m
@@ -49,10 +49,23 @@
                      @"organizationalPerson", @"inetOrgPerson", 
                      @"mozillaAbPersonObsolete", nil]
             forKey: @"objectclass"];
-  [entry setObject: [[self n] objectAtIndex: 1] forKey: @"givenName"];
-  [entry setObject: [[self n] objectAtIndex: 0] forKey: @"sn"];
-  [entry setObject: [self fn] forKey: @"cn"];
-  [entry setObject: [self preferredEMail] forKey: @"mail"];
+  
+  tmp = ([[self n] count] > 1 ? [[self n] objectAtIndex: 1] : nil);
+  if (tmp)
+    [entry setObject: tmp  forKey: @"givenName"];
+  
+  tmp = ([[self n] count] ? [[self n] objectAtIndex: 0] : nil);
+  if (tmp)
+    [entry setObject: tmp  forKey: @"sn"];
+
+  tmp = [self fn];
+  if (tmp)
+    [entry setObject: tmp  forKey: @"cn"];
+  
+  tmp = [self preferredEMail];
+  if (tmp)
+    [entry setObject: tmp forKey: @"mail"];
+  
   [entry setObject: @"0Z" forKey: @"modifytimestamp"];
 
   buffer = [self nickname];