diff --git a/ChangeLog b/ChangeLog
index fd5a23be9..03f4945af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-19  Adam Fedor  <fedor@gnu.org>
+
+	* Source/NSTextView.m (-setSelectedRange:affinity:stillSelecting:): 
+	Prevent NSTextView from asking a text storage of zero length 
+	for attributes (Patch from georg@vhf.de).
+
 2001-08-20  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Headers/gnustep/gui/NSMenu.h
diff --git a/Source/NSTextView.m b/Source/NSTextView.m
index e92d00a85..1b39c8e0b 100644
--- a/Source/NSTextView.m
+++ b/Source/NSTextView.m
@@ -1358,7 +1358,7 @@ static NSNotificationCenter *nc;
 	}
       else  /* no selection, only insertion point */
 	{
-	  if (_tf.is_rich_text)
+	  if (_tf.is_rich_text && [_textStorage length])
 	    {
 	      NSDictionary *dict;