diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog
index f906ac05a..c3dae2208 100644
--- a/SOPE/NGCards/ChangeLog
+++ b/SOPE/NGCards/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-08  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* NSString+NGCards.m (-vCardSubvaluesWithSeparator:): now returns
+	an empty array when the string is empty, instead of an array with
+	an empty string.
+
 2010-10-28  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* iCalRecurrenceRule.m (-isInfinite): a repeat count set to 0 is
diff --git a/SOPE/NGCards/NSString+NGCards.m b/SOPE/NGCards/NSString+NGCards.m
index 30280e7f7..d090bfe00 100644
--- a/SOPE/NGCards/NSString+NGCards.m
+++ b/SOPE/NGCards/NSString+NGCards.m
@@ -322,11 +322,14 @@ static NSString *commaSeparator = nil;
         }
     }
 
-  substring = [[NSString alloc] initWithCharactersNoCopy: substringBuffer
-                                                  length: substringLength
-                                            freeWhenDone: YES];
-  [components addObject: substring];
-  [substring release];
+  if (substringLength > 0)
+    {
+      substring = [[NSString alloc] initWithCharactersNoCopy: substringBuffer
+						      length: substringLength
+						freeWhenDone: YES];
+      [components addObject: substring];
+      [substring release];
+    }
 
   NSZoneFree (NULL, stringBuffer);