diff --git a/SoObjects/Contacts/SOGoContactSourceFolder.m b/SoObjects/Contacts/SOGoContactSourceFolder.m
index 7bf6b1f7c..5f89f2c2d 100644
--- a/SoObjects/Contacts/SOGoContactSourceFolder.m
+++ b/SoObjects/Contacts/SOGoContactSourceFolder.m
@@ -254,12 +254,11 @@
 
   // displayname || c_cn => fn
   data = [oldRecord objectForKey: @"displayname"];
-  if (!data)
+  if(!data || data == [NSNull null] || [data length] < 1)
     data = [oldRecord objectForKey: @"c_cn"];
-  if (data)
-    [newRecord setObject: data forKey: @"fn"];
-  else
+  if(!data || data == [NSNull null] || [data length] < 1)
     data = @"";
+  [newRecord setObject: data forKey: @"fn"];
   [newRecord setObject: data forKey: @"c_cn"];
 
   // sn => c_sn