diff --git a/components/chmhelp/lhelp/chmcontentprovider.pas b/components/chmhelp/lhelp/chmcontentprovider.pas
index d028c5d607..0664fa4dd9 100644
--- a/components/chmhelp/lhelp/chmcontentprovider.pas
+++ b/components/chmhelp/lhelp/chmcontentprovider.pas
@@ -448,12 +448,12 @@ end;
 
 procedure TChmContentProvider.FillTOC(Data: PtrInt);
 var
- fChm: TChmReader;
- ParentNode: TTreeNode;
- i: Integer;
- SM: TChmSiteMap;
- HasSearchIndex: Boolean = False;
- Stream: TMemoryStream;
+  fChm: TChmReader;
+  ParentNode: TTreeNode;
+  i: Integer;
+  SM: TChmSiteMap;
+  HasSearchIndex: Boolean = False;
+  Stream: TMemoryStream;
 begin
   if fFillingToc or fFillingIndex then begin
     Application.QueueAsyncCall(@FillToc, Data);
@@ -575,10 +575,10 @@ end;
 
 procedure TChmContentProvider.ContentsTreeSelectionChanged(Sender: TObject);
 var
-ATreeNode: TContentTreeNode;
-ARootNode: TTreeNode;
-fChm: TChmReader = nil;
-Uri: String;
+  ATreeNode: TContentTreeNode;
+  ARootNode: TTreeNode;
+  fChm: TChmReader = nil;
+  Uri: String;
 begin
   if (fContentsTree.Selected = nil) then Exit;
   if fContentsTree.Selected.Parent = nil then
@@ -676,7 +676,7 @@ var
   SearchText: String;
   Node: TTreeNode;
 begin
-if not fIndexEdit.Focused then Exit;
+  if not fIndexEdit.Focused then Exit;
   SearchText := LowerCase(fIndexEdit.Text);
   Node := fIndexView.Items.GetFirstNode;
   while Node<>nil do begin
@@ -872,6 +872,7 @@ var
   k: Integer;
   Item: TContentTreeNode;
 begin
+//  if fKeywordCombo.Text = '' then Exit;
   SearchWords := TStringList.Create;
   SearchWords.Delimiter := ' ';
   Searchwords.DelimitedText := fKeywordCombo.Text;
diff --git a/components/chmhelp/lhelp/chmdataprovider.pas b/components/chmhelp/lhelp/chmdataprovider.pas
index 6ead83f952..aef5253477 100644
--- a/components/chmhelp/lhelp/chmdataprovider.pas
+++ b/components/chmhelp/lhelp/chmdataprovider.pas
@@ -108,7 +108,7 @@ end;
 function TIpChmDataProvider.DoCheckURL(const URL: string;
   var ContentType: string): Boolean;
 var
-Reader: TChmReader = nil;
+  Reader: TChmReader = nil;
 begin
   //DebugLn('RequestedUrl: ',URL);
   Result := fChm.ObjectExists(StripInPageLink(Url), Reader) > 0;
diff --git a/components/chmhelp/lhelp/lhelpcore.pas b/components/chmhelp/lhelp/lhelpcore.pas
index a0370217c7..5154db31f5 100644
--- a/components/chmhelp/lhelp/lhelpcore.pas
+++ b/components/chmhelp/lhelp/lhelpcore.pas
@@ -608,7 +608,6 @@ begin
   FileMenuCloseItem.Enabled := en;
   ViewMenuContents.Enabled := en;
 
-
   if en and not (csDestroying in ActivePage.ComponentState) then
     Caption := 'LHelp - ' + ActivePage.fContentProvider.Title
   else
@@ -647,10 +646,7 @@ end;
 
 finalization
   if IPCServer <> nil then
-    try
     FreeAndNil(IPCServer);
-    except
-    end;
 
 end.