diff --git a/ChangeLog b/ChangeLog
index 1f2b473c3..1635e447b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-01  Eric Wasylishen  <ewasylishen@gmail.com>
+
+	* Source/NSTextView.m
+	(-_scheduleTextCheckingInVisibleRectIfNeeded): Check for
+	nil before sending -rectValue to avoid crash
+
 2011-11-28 Gregory Casamento <greg.casamento@gmail.com>
 
 	* Source/NSTextView.m (-buildUpTextNetwork:):
diff --git a/Source/NSTextView.m b/Source/NSTextView.m
index 0bcf92f7f..9677e118e 100644
--- a/Source/NSTextView.m
+++ b/Source/NSTextView.m
@@ -6201,7 +6201,8 @@ or add guards
       const NSRect visibleRect = [self visibleRect];
       if (!NSEqualRects(visibleRect, _lastCheckedRect))
 	{
-	   if (NSEqualRects(visibleRect, [[_textCheckingTimer userInfo] rectValue]))
+	   if (nil != _textCheckingTimer 
+	       && NSEqualRects(visibleRect, [[_textCheckingTimer userInfo] rectValue]))
 	     {
 	       return;
 	     }