diff --git a/windows/src/desktop/kmshell/main/UfrmBaseKeyboard.pas b/windows/src/desktop/kmshell/main/UfrmBaseKeyboard.pas
index 825088ad0a..7d8467730c 100644
--- a/windows/src/desktop/kmshell/main/UfrmBaseKeyboard.pas
+++ b/windows/src/desktop/kmshell/main/UfrmBaseKeyboard.pas
@@ -42,7 +42,6 @@ uses
 
 
 function ConfigureAndSetBaseKeyboard(WindowHandle: THandle): Boolean;
-var BaseKeyboardID: Integer;
 begin
   with TfrmBaseKeyboard.Create(nil) do
   try
diff --git a/windows/src/desktop/kmshell/main/UfrmMain.pas b/windows/src/desktop/kmshell/main/UfrmMain.pas
index 46387131d2..b6ccccddd6 100644
--- a/windows/src/desktop/kmshell/main/UfrmMain.pas
+++ b/windows/src/desktop/kmshell/main/UfrmMain.pas
@@ -666,8 +666,6 @@ end;
  ------------------------------------------------------------------------------}
 
 procedure TfrmMain.Options_BaseKeyboard;   // I4169
-var
-  BaseKeyboardID: Integer;
 begin
   if ConfigureAndSetBaseKeyboard(Handle) then
   begin
diff --git a/windows/src/engine/kmcomapi/processes/package/kpinstallpackage.pas b/windows/src/engine/kmcomapi/processes/package/kpinstallpackage.pas
index 023b9ee6ec..51756a2152 100644
--- a/windows/src/engine/kmcomapi/processes/package/kpinstallpackage.pas
+++ b/windows/src/engine/kmcomapi/processes/package/kpinstallpackage.pas
@@ -163,9 +163,18 @@ begin
       inf := nil;
       FZip := TZipFile.Create;
       try
-        FZip.Open(FileName, TZipMode.zmRead);
+        try
+          FZip.Open(FileName, TZipMode.zmRead);
+        except
+          on E:EZipException do
+          begin
+            ErrorFmt(KMN_E_Install_InvalidFile, VarArrayOf([ExtractFileName(FileName), E.Message, 0]));
+            raise;
+          end;
+        end;
 
-        InfFile := '';
+        try
+          InfFile := '';
 
           for i := 0 to FZip.FileCount - 1 do
           begin