diff --git a/ChangeLog b/ChangeLog
index 9f36c4fe3..ef0113956 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+2012-06-27  Richard Frith-Macdonald <rfm@gnu.org>
+
+        * Source/NSScanner.m: Fix missing 'else' which was causing a
+        memory leak and minor performance degradation.
+
 2012-06-12  Richard Frith-Macdonald <rfm@gnu.org>
 
-        * NSPropertyList.m: Check for nil property list argument.
+        * Source/NSPropertyList.m: Check for nil property list argument.
 
 2012-06-07  Wolfgang Lux  <wolfgang.lux@gmail.com>
 
diff --git a/Source/NSScanner.m b/Source/NSScanner.m
index 301923301..7c6ffc553 100644
--- a/Source/NSScanner.m
+++ b/Source/NSScanner.m
@@ -205,7 +205,7 @@ typedef GSString	*ivars;
     {
       _string = [_holder initWithString: aString];
     }
-  if (GSObjCIsKindOf(c, GSUnicodeStringClass) == YES)
+  else if (GSObjCIsKindOf(c, GSUnicodeStringClass) == YES)
     {
       _string = RETAIN(aString);
     }