diff --git a/common/windows/delphi/packages/PackageInfo.pas b/common/windows/delphi/packages/PackageInfo.pas
index 202fa9b4e7f..3f56db33f37 100644
--- a/common/windows/delphi/packages/PackageInfo.pas
+++ b/common/windows/delphi/packages/PackageInfo.pas
@@ -1857,7 +1857,8 @@ procedure TPackage.DoSaveXML(ARoot: IXMLNode);
   Keyboards.SaveXML(ARoot);
   if LexicalModels.Count > 0 then
     LexicalModels.SaveXML(ARoot);
-  RelatedPackages.SaveXML(ARoot);
+  if RelatedPackages.Count > 0 then
+    RelatedPackages.SaveXML(ARoot);
 end;
 
 procedure TPackage.SaveIni;
@@ -2742,6 +2743,9 @@ procedure TPackageKeyboardExampleList.SaveXML(ARoot: IXMLNode);
   j: Integer;
   AExample: IXMLNode;
 begin
+  if Count = 0 then
+    Exit;
+
   AExamples := ARoot.AddChild(SXML_PackageKeyboard_Examples);
   for j := 0 to Count - 1 do
   begin