diff --git a/ChangeLog b/ChangeLog
index 73997ff0b..3a0d723dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 19 11:28:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
+
+	* Source/NSURL.m: skipToNextField() - cope with a nil set of characters
+	to be skipped.
+
 Fri Oct 15 01:28:16 1999  Lyndon Tremblay <humasect@coolmail.com>
 
 	* Source/NSURL.m: (-[scheme]) removed a hopefully accidentally placed
diff --git a/Source/NSScanner.m b/Source/NSScanner.m
index 71f6bf1a0..7d47cfdf9 100644
--- a/Source/NSScanner.m
+++ b/Source/NSScanner.m
@@ -64,7 +64,7 @@ typedef struct {
  * For internal use only.
  */
 #define	skipToNextField()	({\
-  while (_scanLocation < myLength()\
+  while (_scanLocation < myLength() && _charactersToBeSkipped != nil \
     && (*_skipImp)(_charactersToBeSkipped, memSel, myCharacter(_scanLocation)))\
     _scanLocation++;\
   (_scanLocation >= myLength()) ? NO : YES;\