diff --git a/mozilla/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp b/mozilla/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp
index 0f448c7beed..02ac7065625 100644
--- a/mozilla/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp
+++ b/mozilla/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp
@@ -162,7 +162,7 @@ FindNextNode(nsIDOMNode* aNode, nsIDOMNode* aRoot,
     }
     
     aNode->GetParentNode(getter_AddRefs(next));
-    if (next == aRoot)
+    if (next == aRoot || ! next)
       return nsnull;
     aNode = next;