--- a/webengine/osswebengine/WebCore/page/FrameView.cpp	Tue Aug 31 16:17:46 2010 +0300
+++ b/webengine/osswebengine/WebCore/page/FrameView.cpp	Wed Sep 01 12:28:30 2010 +0100
@@ -298,7 +298,7 @@
 void FrameView::layout(bool allowSubtree)
 {
 #if PLATFORM(SYMBIAN)
-    OOM_PRE_CHECK(1024*1024*2, 0, "FrameView::layout")
+    OOM_PRE_CHECK(1024*1024, 0, "FrameView::layout")
 #endif
     if (d->midLayout)
         return;
@@ -719,6 +719,9 @@
     if (!m_frame->document() || !m_frame->document()->shouldScheduleLayout())
         return;
 
+    if (!m_frame->settings())
+        return;
+
     // In flat frame layout mode the content of frame affects layout of the parent frames.
     // Invalidate also parent frame starting from the owner element of this frame.
 #if PLATFORM(SYMBIAN)