--- a/csxhelp/HelpEngine/src/CSXHHTMLContentParser.cpp	Tue Jan 26 15:15:23 2010 +0200
+++ b/csxhelp/HelpEngine/src/CSXHHTMLContentParser.cpp	Tue Feb 02 00:03:40 2010 +0200
@@ -241,7 +241,7 @@
     if(BaflUtils::FileExists( FileSession,masterFile ) )
         {
 #ifdef _DEBUG
-        RDebug::Print(_L("index exist begin to parse!    %c"), aDrive );
+        RDebug::Print(_L("index exist begin to parse!    %c"), TUint( aDrive ) );
 #endif
         CCSXHXMLParseHandler_MasterMetaFile* masterMetaHandler = 
         CCSXHXMLParseHandler_MasterMetaFile::NewL(iCoeEnv);
@@ -356,6 +356,10 @@
 					{
 		            CCSXHHtmlTOC1* CategoryObj = CCSXHHtmlTOC1::NewL(
 		                                        XMLParser->GetApplicationName(),entry.iName,aDrive);
+		            if ( !CategoryObj )
+		                {
+		                continue;
+		                }
 		            iIndexing->RuntimeGenerateIndexL( *CategoryObj, XMLParser->GetFeatureIds() );
 		            if(CategoryObj && aDataBase->GetMainTopics()->InsertChild(CategoryObj,EFalse))
 		            	iHtmlTOC1List.Append(CategoryObj);//Keep a local copy*/ 

--- a/csxhelp/inc/CSXHHtmlTopicContainer.h	Tue Jan 26 15:15:23 2010 +0200
+++ b/csxhelp/inc/CSXHHtmlTopicContainer.h	Tue Feb 02 00:03:40 2010 +0200
@@ -23,7 +23,7 @@
 //reports an error but produces results for other files
 
 #include <coecntrl.h>
-#include <BrCtlLinkResolver.h>
+#include <brctllinkresolver.h>
 #include <brctlinterface.h>
 //RUNTIME
 #include <featurecontrol.h>

--- a/csxhelp/src/CSXHHtmlTopicContainer.cpp	Tue Jan 26 15:15:23 2010 +0200
+++ b/csxhelp/src/CSXHHtmlTopicContainer.cpp	Tue Feb 02 00:03:40 2010 +0200
@@ -30,8 +30,8 @@
 
 
 #include <brctlinterface.h>
-#include <BrowserLauncher.h>
-#include <BrCtlDefs.h>
+#include <browserlauncher.h>
+#include <brctldefs.h>
 
 #include <coemain.h>
 #include <AknUtils.h>