--- a/webengine/osswebengine/WebKit/s60/formcontrols/WebFormFillPopup.cpp	Fri Jul 03 15:54:40 2009 +0100
+++ b/webengine/osswebengine/WebKit/s60/formcontrols/WebFormFillPopup.cpp	Thu Aug 27 07:44:59 2009 +0300
@@ -143,12 +143,8 @@
 
         // y position
         TInt height = m_font->HeightInPixels()*KMaxNumToShow;
-        if (y + height > r.Height())
-            y -= height;
-        else
             y += m_inputHeight;
 
-        //m_listBox->SetRect(TRect(TPoint(x, y), TSize(width, height)));
         SetRect(TRect(TPoint(x, y), TSize(width, height)));
     }
 }
@@ -301,7 +297,9 @@
 }
 
 void WebFormFillPopup::setLocationHintInDoc(const TRect& r, WebCore::Frame* frame)
-{
+{    
+    if (!frame)
+        return;
     WebFrame* webFrame = kit(frame);
 
     // now lets reverse back to the root frame to figure out the screen position