1 files changed, 7 insertions, 5 deletions
diff --git a/Source/WebKit2/WebProcess/WebPage/mac/AccessibilityWebPageObject.mm b/Source/WebKit2/WebProcess/WebPage/mac/AccessibilityWebPageObject.mm
index c88ab7e..1d036fa 100644
--- a/Source/WebKit2/WebProcess/WebPage/mac/AccessibilityWebPageObject.mm
+++ b/Source/WebKit2/WebProcess/WebPage/mac/AccessibilityWebPageObject.mm
@@ -175,10 +175,12 @@ using namespace WebKit;
     point.y -= remotePosition.y;
     point.x -= remotePosition.x;
     
-    WebCore::FrameView* fv = m_page->mainFrame()->coreFrame()->view();
-    if (fv) {
-        point.y += fv->scrollPosition().y();
-        point.x += fv->scrollPosition().x();
+    if (m_page && m_page->mainFrame() && m_page->mainFrame()->coreFrame()) {
+        WebCore::FrameView* fv = m_page->mainFrame()->coreFrame()->view();
+        if (fv) {
+            point.y += fv->scrollPosition().y();
+            point.x += fv->scrollPosition().x();
+        }
     }
     
     return [[self accessibilityRootObjectWrapper] accessibilityHitTest:point];
@@ -186,7 +188,7 @@ using namespace WebKit;
 
 - (id)accessibilityFocusedUIElement 
 {
-    return NSAccessibilityUnignoredDescendant(self);
+    return [[self accessibilityRootObjectWrapper] accessibilityFocusedUIElement];
 }