diff --git a/ChangeLog b/ChangeLog
index 10c99a670..832fc535d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 14 23:45:56 2000  Adam Fedor  <fedor@yogi.doc.com>
+
+	* Source/NSScrollView.m (reflectScrolledClipView:): Check for 
+	contentView before getting frame.
+
 2000-11-13  Fred Kiefer  <FredKiefer@gmx.de>
 
 	* Headers/gnustep/gui/NSPrintInfo.h: Added NSCopying protocol.
diff --git a/Source/NSScrollView.m b/Source/NSScrollView.m
index eed7cd38c..1e47bfe7f 100644
--- a/Source/NSScrollView.m
+++ b/Source/NSScrollView.m
@@ -429,7 +429,8 @@ static Class rulerViewClass = nil;
 
   NSDebugLog (@"reflectScrolledClipView:");
 
-  clipViewBounds = [_contentView bounds];
+  if (_contentView)
+    clipViewBounds = [_contentView bounds];
   if ((documentView = [_contentView documentView]))
     documentFrame = [documentView frame];