--- a/webengine/webkitutils/ToolBar/ToolBarButton.cpp	Tue Aug 31 16:17:46 2010 +0300
+++ b/webengine/webkitutils/ToolBar/ToolBarButton.cpp	Wed Sep 01 12:28:30 2010 +0100
@@ -18,23 +18,22 @@
 // INCLUDE FILES
 #include <e32std.h>
 #include <AknUtils.h>
-#include <StringLoader.h>
+#include <stringloader.h>
 #include "ToolBarButton.h"
 #include "ToolBar.h"
-#include "w32std.h"
-#include "RecentUrlStore.h"
-#include <uri16.h>
-#include <gulicon.h>
+#include "W32STD.H"
+#include <recenturlstore.h>
+#include <Uri16.h>
+#include <GULICON.H>
 #include <AknBidiTextUtils.h>
-#include "brctlinterface.h"
-#include <FavouritesItem.h>
-#include <FavouritesItemList.h>
-#include <FavouritesSession.h>
-#include <FavouritesDb.h>
+#include <brctlinterface.h>
+#include <favouritesitem.h>
+#include <favouritesitemlist.h>
+#include <favouritessession.h>
+#include <favouritesdb.h>
 
 #include "eikon.hrh"
 
-
 // EXTERNAL DATA STRUCTURES
 
 // EXTERNAL FUNCTION PROTOTYPES
@@ -862,6 +861,8 @@
             }
         else
             {
+            if(iToolTipMaskContext)
+            {
             iToolTipMaskContext->SetPenColor(KRgbBlack);
             iToolTipMaskContext->SetBrushColor(KRgbBlack);
             iToolTipMaskContext->SetBrushStyle(CGraphicsContext::ESolidBrush);
@@ -920,6 +921,7 @@
                 iToolTipSprite.Activate();
                 delete visualText;//visual text
                 }
+                }
             }
         }
     else  // aVisible = false