diff --git a/ChangeLog b/ChangeLog
index 6a6294a43..c0e389b84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2002-12-04  Adam Fedor  <fedor@gnu.org>
 
+	* Source/GSSimpleLayoutManager.m ([GSSimpleLayoutManager
+	-textStorage:edited:range:changeInLength:invalidatedRange:]): Make
+	sure view exists before trying to get range (Solaris limitation).
+
 	* Source/NSPrintOperation.m: Update for change in GSSetLocale.
 
 2002-12-04  Adam Fedor  <fedor@gnu.org>
@@ -1795,7 +1799,7 @@ Fri May 10 11:24:38 2002  Nicola Pero  <n.pero@mi.flashnet.it>
 2002-05-01  Adam Fedor  <fedor@gnu.org>
 
 	* Source/NSView.m (-resizeWithOldSuperviewSize:): Check object
-	before getting struct. (Solaris limintation).
+	before getting struct. (Solaris limitation).
 
 2002-04-30  Adam Fedor  <fedor@gnu.org>
 
diff --git a/Source/GSSimpleLayoutManager.m b/Source/GSSimpleLayoutManager.m
index 82fd70062..be969c27a 100644
--- a/Source/GSSimpleLayoutManager.m
+++ b/Source/GSSimpleLayoutManager.m
@@ -608,16 +608,17 @@ static inline float defaultFontHeight ()
   [[aTextContainer textView] sizeToFit];
   [[aTextContainer textView] invalidateTextContainerOrigin];
 
-  {
-    NSRange sr = [[aTextContainer textView] selectedRange];
-    if (sr.length == 0
-	&& aRange.location <= sr.location
-	&& aRange.location + aRange.length >= sr.location)
-      {
-	[[aTextContainer textView] 
-	  updateInsertionPointStateAndRestartTimer: YES];
-      }
-  }
+  if ([aTextContainer textView])
+    {
+      NSRange sr = [[aTextContainer textView] selectedRange];
+      if (sr.length == 0
+	  && aRange.location <= sr.location
+	  && aRange.location + aRange.length >= sr.location)
+	{
+	  [[aTextContainer textView] 
+	    updateInsertionPointStateAndRestartTimer: YES];
+	}
+    }
 
   /* FIXME - it was reported that at this point lineRange is no longer
    * correct ...  looks like sizeToFit / invalidateTextContainerOrigin