diff --git a/macosx/NSStringAdditions.m b/macosx/NSStringAdditions.m
index 84a6df2a8..e0cb65f9a 100644
--- a/macosx/NSStringAdditions.m
+++ b/macosx/NSStringAdditions.m
@@ -191,21 +191,19 @@
     {
         const NSRange range = [self rangeOfCharacterFromSet: separator options: 0 range: NSMakeRange(i, [self length]-i)];
         
-        if (range.location != i)
+        if (range.location == NSNotFound)
         {
-            if (range.location == NSNotFound)
-            {
-                [components addObject: [self substringFromIndex: i]];
-                break;
-            }
-            else
-            {
-                const NSUInteger length = range.location - i;
-                [components addObject: [self substringWithRange: NSMakeRange(i, length)]];
-                
-                i += length;
-            }
+            [components addObject: [self substringFromIndex: i]];
+            break;
         }
+        else if (range.location != i)
+        {
+            const NSUInteger length = range.location - i;
+            [components addObject: [self substringWithRange: NSMakeRange(i, length)]];
+            
+            i += length;
+        }
+        
         i += range.length;
     }