diff --git a/components/fpspreadsheet/source/common/fpsopendocument.pas b/components/fpspreadsheet/source/common/fpsopendocument.pas
index 159a07fa6..e1e5db9a0 100644
--- a/components/fpspreadsheet/source/common/fpsopendocument.pas
+++ b/components/fpspreadsheet/source/common/fpsopendocument.pas
@@ -2191,7 +2191,7 @@ begin
   else if NullDateSetting = '1904-01-01' then
     FDateMode := dmODS1904
   else
-    raise EFPSpreadsheet.CreateFmt('Spreadsheet file corrupt: cannot handle null-date format %s', [NullDateSetting]);
+    raise EFPSpreadsheetReader.CreateFmt('Spreadsheet file corrupt: cannot handle null-date format %s', [NullDateSetting]);
 end;
 
 procedure TsSpreadOpenDocReader.ReadDocumentProtection(ANode: TDOMNode);
@@ -2643,11 +2643,11 @@ begin
 
       BodyNode := Doc.DocumentElement.FindNode('office:body');
       if not Assigned(BodyNode) then
-        raise EFPSpreadsheet.Create('[TsSpreadOpenDocReader.ReadFromStream] Node "office:body" not found.');
+        raise EFPSpreadsheetReader.Create('[TsSpreadOpenDocReader.ReadFromStream] Node "office:body" not found.');
 
       SpreadSheetNode := BodyNode.FindNode('office:spreadsheet');
       if not Assigned(SpreadSheetNode) then
-        raise EFPSpreadsheet.Create('[TsSpreadOpenDocReader.ReadFromStream] Node "office:spreadsheet" not found.');
+        raise EFPSpreadsheetReader.Create('[TsSpreadOpenDocReader.ReadFromStream] Node "office:spreadsheet" not found.');
 
       ReadSheets(SpreadsheetNode);
       ReadDocumentProtection(SpreadsheetNode);
@@ -7670,7 +7670,7 @@ begin
         end;
       end;
       if styleName = '' then
-        raise EFPSpreadsheet.Create(rsRowStyleNotFound);
+        raise EFPSpreadsheetWriter.Create(rsRowStyleNotFound);
     end;
 
     // No empty rows allowed here for the moment!
diff --git a/components/fpspreadsheet/source/common/xlsbiff2.pas b/components/fpspreadsheet/source/common/xlsbiff2.pas
index e212e669f..3e9970272 100644
--- a/components/fpspreadsheet/source/common/xlsbiff2.pas
+++ b/components/fpspreadsheet/source/common/xlsbiff2.pas
@@ -670,7 +670,7 @@ begin
       BIFF2EOF := True;
 
     if not BOFFound then
-      raise EFPSpreadsheet.Create('BOF record not found.');
+      raise EFPSpreadsheetReader.Create('BOF record not found.');
   end;
 
   FixCols(FWorksheet);
diff --git a/components/fpspreadsheet/source/common/xlsbiff5.pas b/components/fpspreadsheet/source/common/xlsbiff5.pas
index d3ef8f75c..7abf1c4d5 100644
--- a/components/fpspreadsheet/source/common/xlsbiff5.pas
+++ b/components/fpspreadsheet/source/common/xlsbiff5.pas
@@ -2162,7 +2162,7 @@ var
       lsMediumDashDotDot  : Result := lsDashed;
       lsSlantDashDot      : Result := lsDashed;
     else
-      raise EFPSpreadsheet.Create('[TsSpreadBIFF5Writer.WriteXF] Linestyle not supported.');
+      raise EFPSpreadsheetWriter.Create('[TsSpreadBIFF5Writer.WriteXF] Linestyle not supported.');
     end;
   end;