diff --git a/accessible/src/base/nsDocAccessible.cpp b/accessible/src/base/nsDocAccessible.cpp index 6d7c055e560e..ed2058ca8879 100644 --- a/accessible/src/base/nsDocAccessible.cpp +++ b/accessible/src/base/nsDocAccessible.cpp @@ -284,6 +284,10 @@ NS_IMETHODIMP nsDocAccessible::TakeFocus() NS_ENSURE_TRUE(docShell, NS_ERROR_FAILURE); nsCOMPtr shell(GetPresShell()); + if (!shell) { + NS_WARNING("Was not shutdown properly via InvalidateCacheSubtree()"); + return NS_ERROR_FAILURE; + } nsIEventStateManager *esm = shell->GetPresContext()->EventStateManager(); NS_ENSURE_TRUE(esm, NS_ERROR_FAILURE);