diff --git a/Src/xWorks/XhtmlDocView.cs b/Src/xWorks/XhtmlDocView.cs
index 849e62d2d8..ce2e94dc02 100644
--- a/Src/xWorks/XhtmlDocView.cs
+++ b/Src/xWorks/XhtmlDocView.cs
@@ -1308,7 +1308,7 @@ private void ScrollAndHighlightResult(GeckoWebBrowser geckoBrowser, IBasicFindVi
private void ClearCurrentFindResult(GeckoWebBrowser geckoBrowser, string lastId)
{
- var currentElement = geckoBrowser.Document.GetHtmlElementById(lastId);
+ var currentElement = geckoBrowser.Document?.GetHtmlElementById(lastId);
if (currentElement != null)
docView.RemoveClassFromHtmlElement(currentElement, CurrentSelectedEntryClass);
}
@@ -1321,6 +1321,12 @@ private bool InitResults(string searchText)
if (results == null || results.Length == 0)
{
string newResults = string.Empty;
+ if (geckoBrowser.Document == null)
+ {
+ results = null;
+ resultIndex = 0;
+ return true;
+ }
geckoBrowser.RemoveMessageEventListener("find");
geckoBrowser.AddMessageEventListener("find", r => newResults = r);
using(var executor = new AutoJSContext(geckoBrowser.Window))