diff --git a/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
index 3a6b4c6007..9c9fd0ad1d 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
@@ -110,7 +110,7 @@ public class XMLSlideShow extends POIXMLDocument
     /**
      * @param pkg OPC package
      * @throws POIXMLException a RuntimeException that can be caused by invalid OOXML data
-     * @throws RuntimeException a number of other runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of other runtime exceptions can be thrown, especially if there are problems with the
      * input format
      */
     public XMLSlideShow(OPCPackage pkg) {
@@ -132,7 +132,7 @@ public class XMLSlideShow extends POIXMLDocument
      * @param is InputStream
      * @throws IOException If reading data from the stream fails
      * @throws POIXMLException a RuntimeException that can be caused by invalid OOXML data
-     * @throws RuntimeException a number of other runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of other runtime exceptions can be thrown, especially if there are problems with the
      * input format
      */
     public XMLSlideShow(InputStream is) throws IOException {
@@ -472,7 +472,7 @@ public class XMLSlideShow extends POIXMLDocument
      * @param index The slide number to remove.
      * @return The slide that was removed.
      *
-     * @throws RuntimeException a number of runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of runtime exceptions can be thrown, especially if there are problems with the
      * input format
      */
     public XSLFSlide removeSlide(int index) {
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideShow.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideShow.java
index 326137b6a1..f489b8c32e 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideShow.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideShow.java
@@ -236,7 +236,7 @@ public class XSLFSlideShow extends POIXMLDocument {
         try {
             commentRels = slidePart.getRelationshipsByType(XSLFRelation.COMMENTS.getRelation());
         } catch(InvalidFormatException e) {
-            throw new IllegalStateException(e);
+            throw new IOException(e);
         }
 
         if(commentRels.isEmpty()) {
@@ -244,7 +244,7 @@ public class XSLFSlideShow extends POIXMLDocument {
             return null;
         }
         if(commentRels.size() > 1) {
-            throw new IllegalStateException("Expecting 0 or 1 comments for a slide, but found " + commentRels.size());
+            throw new IOException("Expecting 0 or 1 comments for a slide, but found " + commentRels.size());
         }
 
         try {
@@ -256,7 +256,7 @@ public class XSLFSlideShow extends POIXMLDocument {
                 return commDoc.getCmLst();
             }
         } catch(InvalidFormatException e) {
-            throw new IllegalStateException(e);
+            throw new IOException(e);
         }
     }
 
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFSheet.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFSheet.java
index 4baa90bc7d..077eaaef3f 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFSheet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFSheet.java
@@ -44,7 +44,7 @@ public class DeferredSXSSFSheet extends SXSSFSheet {
     /**
      * Unsupported in DeferredSXSSFSheet
      *
-     * @throws RuntimeException this is unsupported
+     * @throws IllegalStateException this is unsupported
      */
     @Override
     public InputStream getWorksheetXMLInputStream() throws IOException {
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/OpcOutputStream.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/OpcOutputStream.java
index 581606f82d..2079746f94 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/OpcOutputStream.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/OpcOutputStream.java
@@ -71,6 +71,7 @@ class OpcOutputStream extends DeflaterOutputStream {
     }
 
     /**
+     * @throws IllegalStateException if no entry found
      * @see ZipOutputStream#closeEntry()
      */
     public void closeEntry() throws IOException {
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFCell.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFCell.java
index dd96f37256..17d8e147b6 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFCell.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFCell.java
@@ -139,6 +139,7 @@ public class SXSSFCell extends CellBase {
      * @return one of ({@link CellType#NUMERIC}, {@link CellType#STRING},
      *     {@link CellType#BOOLEAN}, {@link CellType#ERROR}) depending
      * on the cached value of the formula
+     * @throws IllegalStateException if cell is not a formula cell
      */
     @Override
     public CellType getCachedFormulaResultType() {
@@ -253,7 +254,7 @@ public class SXSSFCell extends CellBase {
                     _value = new ErrorFormulaValue(formula, getErrorCellValue());
                     break;
                 default:
-                    throw new IllegalStateException("Cannot set a formula for a cell of type " + getCellType());
+                    throw new FormulaParseException("Cannot set a formula for a cell of type " + getCellType());
             }
         }
     }
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFRow.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFRow.java
index fb9a8846a1..edf1977c2a 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFRow.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFRow.java
@@ -146,7 +146,7 @@ public class SXSSFRow implements Row, Comparable<SXSSFRow>
     }
 
     /**
-     * @throws RuntimeException if the bounds are exceeded.
+     * @throws IllegalStateException if the bounds are exceeded.
      */
     private static void checkBounds(int cellIndex) {
         SpreadsheetVersion v = SpreadsheetVersion.EXCEL2007;
@@ -219,7 +219,7 @@ public class SXSSFRow implements Row, Comparable<SXSSFRow>
      * @param cellnum  0 based column number
      * @return Cell representing that column or null if undefined.
      * @see #getCell(int, org.apache.poi.ss.usermodel.Row.MissingCellPolicy)
-     * @throws RuntimeException if cellnum is out of bounds
+     * @throws IllegalStateException if cellnum is out of bounds
      */
     @Override
     public SXSSFCell getCell(int cellnum) {
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
index 748117d8e1..5eb5a4be49 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
@@ -1353,7 +1353,7 @@ public class SXSSFSheet implements Sheet, OoxmlSheetExtensions {
      *
      * @param row   start row of a groupped range of rows (0-based)
      * @param collapse whether to expand/collapse the detail rows
-     * @throws RuntimeException if collapse is false as this is not implemented for SXSSF.
+     * @throws IllegalStateException if collapse is false as this is not implemented for SXSSF.
      */
     @Override
     public void setRowGroupCollapsed(int row, boolean collapse) {
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
index e8b881f3a4..38feae68e9 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
@@ -1315,7 +1315,7 @@ public class SXSSFWorkbook implements Workbook {
      * @param name The name the workbook will be referenced as in formulas
      * @param workbook The open workbook to fetch the link required information from
      *
-     * @throws RuntimeException stating that this method is not implemented yet.
+     * @throws IllegalStateException stating that this method is not implemented yet.
      */
     @Override
     @NotImplemented
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCell.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCell.java
index 0a85c786c7..bbdb2c35e5 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCell.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCell.java
@@ -988,7 +988,7 @@ public final class XSSFCell extends CellBase {
     }
 
     /**
-     * @throws RuntimeException if the bounds are exceeded.
+     * @throws IllegalStateException if the bounds are exceeded.
      */
     private static void checkBounds(int cellIndex) {
         SpreadsheetVersion v = SpreadsheetVersion.EXCEL2007;
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
index c649cd74d1..a31f669b26 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
@@ -247,7 +247,7 @@ public class XSSFWorkbook extends POIXMLDocument implements Workbook, Date1904Su
      * @param pkg the OpenXML4J {@code OPC Package} object.
      * @throws IOException If reading data from the package fails
      * @throws POIXMLException a RuntimeException that can be caused by invalid OOXML data
-     * @throws RuntimeException a number of other runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of other runtime exceptions can be thrown, especially if there are problems with the
      * input format
      */
     public XSSFWorkbook(OPCPackage pkg) throws IOException {
@@ -279,7 +279,7 @@ public class XSSFWorkbook extends POIXMLDocument implements Workbook, Date1904Su
      *
      * @throws IOException If reading data from the stream fails
      * @throws POIXMLException a RuntimeException that can be caused by invalid OOXML data
-     * @throws RuntimeException a number of other runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of other runtime exceptions can be thrown, especially if there are problems with the
      * input format
      */
     public XSSFWorkbook(InputStream is) throws IOException {
@@ -304,7 +304,7 @@ public class XSSFWorkbook extends POIXMLDocument implements Workbook, Date1904Su
      * @throws IOException If reading data from the file fails
      * @throws InvalidFormatException If the file has a format that cannot be read or if the file is corrupted
      * @throws POIXMLException a RuntimeException that can be caused by invalid OOXML data
-     * @throws RuntimeException a number of other runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of other runtime exceptions can be thrown, especially if there are problems with the
      * input format
      */
     public XSSFWorkbook(File file) throws IOException, InvalidFormatException {
@@ -325,7 +325,7 @@ public class XSSFWorkbook extends POIXMLDocument implements Workbook, Date1904Su
      * @param path   the file name.
      * @throws IOException If reading data from the file fails
      * @throws POIXMLException a RuntimeException that can be caused by invalid OOXML data
-     * @throws RuntimeException a number of other runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of other runtime exceptions can be thrown, especially if there are problems with the
      * input format
      *
      */
@@ -338,7 +338,7 @@ public class XSSFWorkbook extends POIXMLDocument implements Workbook, Date1904Su
      * @param part  package part
      * @throws IOException If reading data from the Package Part fails
      * @throws POIXMLException a RuntimeException that can be caused by invalid OOXML data
-     * @throws RuntimeException a number of other runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of other runtime exceptions can be thrown, especially if there are problems with the
      * input format
      * @since POI 4.0.0
      */
@@ -455,7 +455,7 @@ public class XSSFWorkbook extends POIXMLDocument implements Workbook, Date1904Su
      * the DOM based parse of large sheets (see examples).
      *
      * @throws POIXMLException a RuntimeException that can be caused by invalid OOXML data
-     * @throws RuntimeException a number of other runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of other runtime exceptions can be thrown, especially if there are problems with the
      * input format
      */
     public void parseSheet(Map<String, XSSFSheet> shIdMap, CTSheet ctSheet) {
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
index 29be42e926..0f7f08f619 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
@@ -136,7 +136,7 @@ public class XWPFDocument extends POIXMLDocument implements Document, IBody {
      * @param pkg OPC package
      * @throws IOException If reading data from the package fails
      * @throws POIXMLException a RuntimeException that can be caused by invalid OOXML data
-     * @throws RuntimeException a number of other runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of other runtime exceptions can be thrown, especially if there are problems with the
      * input format
      */
     public XWPFDocument(OPCPackage pkg) throws IOException {
@@ -150,7 +150,7 @@ public class XWPFDocument extends POIXMLDocument implements Document, IBody {
      * @param is The InputStream to read data from
      * @throws IOException If reading data from the stream fails
      * @throws POIXMLException a RuntimeException that can be caused by invalid OOXML data
-     * @throws RuntimeException a number of other runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of other runtime exceptions can be thrown, especially if there are problems with the
      * input format
      */
     public XWPFDocument(InputStream is) throws IOException {
diff --git a/poi-ooxml/src/test/java/org/apache/poi/xssf/XSSFTestDataSamples.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/XSSFTestDataSamples.java
index 3a0ed9d4c3..30cb09a09a 100644
--- a/poi-ooxml/src/test/java/org/apache/poi/xssf/XSSFTestDataSamples.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/XSSFTestDataSamples.java
@@ -139,7 +139,7 @@ public class XSSFTestDataSamples {
      * @param wb The workbook to write out, it is closed after the call.
      * @param testName file name to be used to write to a file. This file will be cleaned up by a call to readBack(String)
      * @return workbook location
-     * @throws RuntimeException if {@link #TEST_OUTPUT_DIR} System property is not set
+     * @throws IllegalStateException if {@link #TEST_OUTPUT_DIR} System property is not set
      */
     public static <R extends Workbook> File writeOutAndClose(R wb, String testName) {
         try {
@@ -160,7 +160,7 @@ public class XSSFTestDataSamples {
      *
      * @param wb the workbook to write
      * @return the memory buffer
-     * @throws RuntimeException If writing the file fails
+     * @throws IllegalStateException If writing the file fails
      */
     public static <R extends Workbook> UnsynchronizedByteArrayOutputStream writeOutAndClose(R wb) throws IOException {
         UnsynchronizedByteArrayOutputStream out = writeOut(wb);
diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hmef/HMEFMessage.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/HMEFMessage.java
index 6788be2403..26f5238310 100644
--- a/poi-scratchpad/src/main/java/org/apache/poi/hmef/HMEFMessage.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hmef/HMEFMessage.java
@@ -51,7 +51,7 @@ public final class HMEFMessage {
     /**
      * @param inp input stream
      * @throws IOException If reading data from the stream fails
-     * @throws RuntimeException a number of runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of runtime exceptions can be thrown, especially if there are problems with the
      * input format
      */
     public HMEFMessage(InputStream inp) throws IOException {
diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShow.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShow.java
index fa4cf6c795..54438d7bb7 100644
--- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShow.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShow.java
@@ -167,7 +167,7 @@ public final class HSLFSlideShow extends POIDocument implements SlideShow<HSLFSh
     /**
      * Constructs a Powerpoint document from an input stream.
      * @throws IOException If reading data from the stream fails
-     * @throws RuntimeException a number of runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of runtime exceptions can be thrown, especially if there are problems with the
      * input format
      */
     @SuppressWarnings("resource")
@@ -178,7 +178,7 @@ public final class HSLFSlideShow extends POIDocument implements SlideShow<HSLFSh
     /**
      * Constructs a Powerpoint document from an POIFSFileSystem.
      * @throws IOException If reading data from the file-system fails
-     * @throws RuntimeException a number of runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of runtime exceptions can be thrown, especially if there are problems with the
      * input format
      */
     @SuppressWarnings("resource")
@@ -189,7 +189,7 @@ public final class HSLFSlideShow extends POIDocument implements SlideShow<HSLFSh
     /**
      * Constructs a Powerpoint document from an DirectoryNode.
      * @throws IOException If reading data from the DirectoryNode fails
-     * @throws RuntimeException a number of runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of runtime exceptions can be thrown, especially if there are problems with the
      * input format
      */
     @SuppressWarnings("resource")
diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java
index 52a0a962c3..2c0d96303a 100644
--- a/poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java
@@ -110,7 +110,7 @@ public class MAPIMessage extends POIReadOnlyDocument {
      *
      * @param filename Name of the file to read
      * @throws IOException      on errors reading, or invalid data
-     * @throws RuntimeException a number of runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of runtime exceptions can be thrown, especially if there are problems with the
      *                          input format
      */
     public MAPIMessage(String filename) throws IOException {
@@ -122,7 +122,7 @@ public class MAPIMessage extends POIReadOnlyDocument {
      *
      * @param file The file to read from
      * @throws IOException      on errors reading, or invalid data
-     * @throws RuntimeException a number of runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of runtime exceptions can be thrown, especially if there are problems with the
      *                          input format
      */
     public MAPIMessage(File file) throws IOException {
@@ -137,7 +137,7 @@ public class MAPIMessage extends POIReadOnlyDocument {
      *
      * @param in The InputStream to buffer and then read from
      * @throws IOException      on errors reading, or invalid data
-     * @throws RuntimeException a number of runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of runtime exceptions can be thrown, especially if there are problems with the
      *                          input format
      */
     public MAPIMessage(InputStream in) throws IOException {
@@ -149,7 +149,7 @@ public class MAPIMessage extends POIReadOnlyDocument {
      *
      * @param fs Open POIFS FileSystem containing the message
      * @throws IOException      on errors reading, or invalid data
-     * @throws RuntimeException a number of runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of runtime exceptions can be thrown, especially if there are problems with the
      *                          input format
      */
     public MAPIMessage(POIFSFileSystem fs) throws IOException {
@@ -162,7 +162,7 @@ public class MAPIMessage extends POIReadOnlyDocument {
      *
      * @param poifsDir Directory containing the message
      * @throws IOException      on errors reading, or invalid data
-     * @throws RuntimeException a number of runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of runtime exceptions can be thrown, especially if there are problems with the
      *                          input format
      */
     public MAPIMessage(DirectoryNode poifsDir) throws IOException {
diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java b/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java
index 36e8b5983e..e483bd8c96 100644
--- a/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java
@@ -104,7 +104,7 @@ public class ExcelToHtmlConverter extends AbstractExcelConverter {
      * @return DOM representation of result HTML
      * @throws IOException                  If an error occurs reading or writing files
      * @throws ParserConfigurationException If configuration is incorrect
-     * @throws RuntimeException a number of runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of runtime exceptions can be thrown, especially if there are problems with the
      * input format
      */
     public static Document process(File xlsFile) throws IOException, ParserConfigurationException {
@@ -120,7 +120,7 @@ public class ExcelToHtmlConverter extends AbstractExcelConverter {
      * @return DOM representation of result HTML
      * @throws IOException                  If an error occurs reading or writing files
      * @throws ParserConfigurationException If configuration is incorrect
-     * @throws RuntimeException a number of runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of runtime exceptions can be thrown, especially if there are problems with the
      * input format
      */
     public static Document process(InputStream xlsStream) throws IOException, ParserConfigurationException {
@@ -136,7 +136,7 @@ public class ExcelToHtmlConverter extends AbstractExcelConverter {
      * @return DOM representation of result HTML
      * @throws IOException                  If an error occurs reading or writing files
      * @throws ParserConfigurationException If configuration is incorrect
-     * @throws RuntimeException a number of runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of runtime exceptions can be thrown, especially if there are problems with the
      * input format
      */
     public static Document process(HSSFWorkbook workbook) throws IOException, ParserConfigurationException {
diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfPicture.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfPicture.java
index 7098f2811d..da220c941e 100644
--- a/poi-scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfPicture.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfPicture.java
@@ -83,7 +83,7 @@ public class HwmfPicture implements Iterable<HwmfRecord>, GenericRecord {
     /**
      * @param inputStream The InputStream to read data from
      * @throws IOException If reading data from the file fails
-     * @throws RuntimeException a number of runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of runtime exceptions can be thrown, especially if there are problems with the
      * input format
      */
     public HwmfPicture(InputStream inputStream) throws IOException {
@@ -198,7 +198,7 @@ public class HwmfPicture implements Iterable<HwmfRecord>, GenericRecord {
      *
      * @return the bounding box
      *
-     * @throws RuntimeException if neither WmfSetWindowOrg/Ext nor the placeableHeader are set
+     * @throws IllegalStateException if neither WmfSetWindowOrg/Ext nor the placeableHeader are set
      */
     public Rectangle2D getBounds() {
         if (placeableHeader != null) {
diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocument.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocument.java
index d52c149af1..5a4296f8e1 100644
--- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocument.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocument.java
@@ -215,7 +215,7 @@ public final class HWPFDocument extends HWPFDocumentCore {
      * @throws IOException If there is an unexpected IOException from the passed
      *                     in InputStream.
      * @throws org.apache.poi.EmptyFileException If the given stream is empty
-     * @throws RuntimeException a number of other runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of other runtime exceptions can be thrown, especially if there are problems with the
      * input format
      */
     public HWPFDocument(InputStream istream) throws IOException {
@@ -229,7 +229,7 @@ public final class HWPFDocument extends HWPFDocumentCore {
      * @param pfilesystem The POIFSFileSystem that contains the Word document.
      * @throws IOException If there is an unexpected IOException from the passed
      *                     in POIFSFileSystem.
-     * @throws RuntimeException a number of runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of runtime exceptions can be thrown, especially if there are problems with the
      * input format
      */
     public HWPFDocument(POIFSFileSystem pfilesystem) throws IOException {
@@ -244,7 +244,7 @@ public final class HWPFDocument extends HWPFDocumentCore {
      * @param directory The DirectoryNode that contains the Word document.
      * @throws IOException If there is an unexpected IOException from the passed
      *                     in POIFSFileSystem.
-     * @throws RuntimeException a number of runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of runtime exceptions can be thrown, especially if there are problems with the
      * input format
      */
     public HWPFDocument(DirectoryNode directory) throws IOException {
diff --git a/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFCell.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFCell.java
index d11372079b..7e5f7f5fb7 100644
--- a/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFCell.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFCell.java
@@ -1002,7 +1002,7 @@ public class HSSFCell extends CellBase {
     }
 
     /**
-     * @throws RuntimeException if the bounds are exceeded.
+     * @throws IllegalStateException if the bounds are exceeded.
      */
     private static void checkBounds(int cellIndex) {
         if (cellIndex < 0 || cellIndex > LAST_COLUMN_NUMBER) {
diff --git a/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFPalette.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFPalette.java
index d2fa999d4f..4089ebcd8a 100644
--- a/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFPalette.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFPalette.java
@@ -159,7 +159,7 @@ public final class HSSFPalette {
      *
      * @return  The new custom color.
      *
-     * @throws RuntimeException if there are more more free color indexes.
+     * @throws IllegalStateException if there are more more free color indexes.
      */
     public HSSFColor addColor( byte red, byte green, byte blue )
     {
diff --git a/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
index cef0edaa37..12a4ff008a 100644
--- a/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
@@ -256,7 +256,7 @@ public final class HSSFWorkbook extends POIDocument implements Workbook {
      * preserve nodes set to true.
      *
      * @throws IOException if the stream cannot be read
-     * @throws RuntimeException a number of runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of runtime exceptions can be thrown, especially if there are problems with the
      * input format
      * @see #HSSFWorkbook(POIFSFileSystem, boolean)
      * @see POIFSFileSystem
@@ -275,7 +275,7 @@ public final class HSSFWorkbook extends POIDocument implements Workbook {
      *                      need to. If set, will store all of the POIFSFileSystem
      *                      in memory
      * @throws IOException if the stream cannot be read
-     * @throws RuntimeException a number of runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of runtime exceptions can be thrown, especially if there are problems with the
      * input format
      * @see POIFSFileSystem
      */
@@ -324,7 +324,7 @@ public final class HSSFWorkbook extends POIDocument implements Workbook {
      *                      need to. If set, will store all of the POIFSFileSystem
      *                      in memory
      * @throws IOException if the stream cannot be read
-     * @throws RuntimeException a number of runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of runtime exceptions can be thrown, especially if there are problems with the
      * input format
      * @see POIFSFileSystem
      */
@@ -344,7 +344,7 @@ public final class HSSFWorkbook extends POIDocument implements Workbook {
      *                      need to. If set, will store all of the POIFSFileSystem
      *                      in memory
      * @throws IOException if the stream cannot be read
-     * @throws RuntimeException a number of runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of runtime exceptions can be thrown, especially if there are problems with the
      * input format
      * @see POIFSFileSystem
      */
@@ -401,7 +401,7 @@ public final class HSSFWorkbook extends POIDocument implements Workbook {
      * preserve nodes set to true.
      *
      * @throws IOException if the stream cannot be read
-     * @throws RuntimeException a number of runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of runtime exceptions can be thrown, especially if there are problems with the
      * input format
      * @see #HSSFWorkbook(InputStream, boolean)
      * @see #HSSFWorkbook(POIFSFileSystem)
@@ -420,7 +420,7 @@ public final class HSSFWorkbook extends POIDocument implements Workbook {
      *                      macros.  This takes more memory, so only say yes if you
      *                      need to.
      * @throws IOException if the stream cannot be read
-     * @throws RuntimeException a number of runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of runtime exceptions can be thrown, especially if there are problems with the
      * input format
      * @see POIFSFileSystem
      * @see #HSSFWorkbook(POIFSFileSystem)
diff --git a/poi/src/main/java/org/apache/poi/ss/format/SimpleFraction.java b/poi/src/main/java/org/apache/poi/ss/format/SimpleFraction.java
index 41f1d07fea..29404f6d9f 100644
--- a/poi/src/main/java/org/apache/poi/ss/format/SimpleFraction.java
+++ b/poi/src/main/java/org/apache/poi/ss/format/SimpleFraction.java
@@ -43,7 +43,7 @@ public class SimpleFraction {
      * @param value the double value to convert to a fraction.
      * @param maxDenominator maximum denominator value allowed.
      *
-     * @throws RuntimeException if the continued fraction failed to
+     * @throws IllegalStateException if the continued fraction failed to
      *      converge.
      * @throws IllegalArgumentException if value &gt; Integer.MAX_VALUE
      */
@@ -68,7 +68,7 @@ public class SimpleFraction {
      *        {@code epsilon} of {@code value}, in absolute terms.
      * @param maxDenominator maximum denominator value allowed.
      * @param maxIterations maximum number of convergents
-     * @throws RuntimeException if the continued fraction failed to
+     * @throws IllegalStateException if the continued fraction failed to
      *         converge.
      * @throws IllegalArgumentException if value > Integer.MAX_VALUE
      */
diff --git a/poi/src/main/java/org/apache/poi/ss/formula/FormulaParseException.java b/poi/src/main/java/org/apache/poi/ss/formula/FormulaParseException.java
index 878a6bc740..42ed732f1f 100644
--- a/poi/src/main/java/org/apache/poi/ss/formula/FormulaParseException.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/FormulaParseException.java
@@ -25,7 +25,7 @@ package org.apache.poi.ss.formula;
  */
 public final class FormulaParseException extends RuntimeException {
 
-    FormulaParseException(String msg) {
+    public FormulaParseException(String msg) {
         super(msg);
     }
 }
diff --git a/poi/src/main/java/org/apache/poi/ss/formula/OperationEvaluationContext.java b/poi/src/main/java/org/apache/poi/ss/formula/OperationEvaluationContext.java
index b22e18e55f..37db5d6e04 100644
--- a/poi/src/main/java/org/apache/poi/ss/formula/OperationEvaluationContext.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/OperationEvaluationContext.java
@@ -208,7 +208,7 @@ public final class OperationEvaluationContext {
      * @param isA1Style    specifies the format for {@code refStrPart1} and {@code refStrPart2}.
      *                     Pass {@code true} for 'A1' style and {@code false} for 'R1C1' style.
      * @return a {@link RefEval} or {@link AreaEval}
-     * @throws RuntimeException If invalid parameters are provided
+     * @throws IllegalStateException If invalid parameters are provided
      */
     public ValueEval getDynamicReference(String workbookName, String sheetName, String refStrPart1,
                                          String refStrPart2, boolean isA1Style) {
diff --git a/poi/src/main/java/org/apache/poi/ss/formula/eval/ErrorEval.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/ErrorEval.java
index c4dd9eed84..f831149760 100644
--- a/poi/src/main/java/org/apache/poi/ss/formula/eval/ErrorEval.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/ErrorEval.java
@@ -52,7 +52,7 @@ public final class ErrorEval implements ValueEval {
     /**
      * Translates an Excel internal error code into the corresponding POI ErrorEval instance
      * @param errorCode An error code listed in {@link FormulaError}
-     * @throws RuntimeException If an unknown errorCode is specified
+     * @throws IllegalStateException If an unknown errorCode is specified
      */
     public static ErrorEval valueOf(int errorCode) {
         FormulaError error = FormulaError.forInt(errorCode);
diff --git a/poi/src/main/java/org/apache/poi/ss/formula/eval/OperandResolver.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/OperandResolver.java
index 5619b70fbe..710c9f7713 100644
--- a/poi/src/main/java/org/apache/poi/ss/formula/eval/OperandResolver.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/OperandResolver.java
@@ -246,7 +246,7 @@ public final class OperandResolver {
      * @return actual, parsed or interpreted double value (respectively).
      * @throws EvaluationException if a StringEval is supplied and cannot be parsed
      * as a double (See {@code parseDouble()} for allowable formats).
-     * @throws RuntimeException if the supplied parameter is not {@link NumberEval},
+     * @throws IllegalStateException if the supplied parameter is not {@link NumberEval},
      * {@link StringEval}, {@link BoolEval} or {@link BlankEval}
      */
     public static double coerceValueToDouble(ValueEval ev) throws EvaluationException {
diff --git a/poi/src/main/java/org/apache/poi/ss/usermodel/WorkbookFactory.java b/poi/src/main/java/org/apache/poi/ss/usermodel/WorkbookFactory.java
index 82b9c900d0..707c045bab 100644
--- a/poi/src/main/java/org/apache/poi/ss/usermodel/WorkbookFactory.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/WorkbookFactory.java
@@ -67,7 +67,7 @@ public final class WorkbookFactory {
      * @return The created workbook
      *
      * @throws IOException if an error occurs while creating the objects
-     * @throws RuntimeException a number of other runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of other runtime exceptions can be thrown, especially if there are problems with the
      * input format
      */
     public static Workbook create(boolean xssf) throws IOException {
@@ -85,7 +85,7 @@ public final class WorkbookFactory {
      * @return The created workbook
      *
      * @throws IOException if an error occurs while reading the data
-     * @throws RuntimeException a number of runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of runtime exceptions can be thrown, especially if there are problems with the
      * input format
      */
     public static Workbook create(POIFSFileSystem fs) throws IOException {
@@ -105,7 +105,7 @@ public final class WorkbookFactory {
      *  @return The created Workbook
      *
      *  @throws IOException if an error occurs while reading the data
-     *  @throws RuntimeException a number of runtime exceptions can be thrown, especially if there are problems with the
+     *  @throws IllegalStateException a number of runtime exceptions can be thrown, especially if there are problems with the
      *  input format
      */
     private static Workbook create(final POIFSFileSystem fs, String password) throws IOException {
@@ -124,7 +124,7 @@ public final class WorkbookFactory {
      * @return The created Workbook
      *
      * @throws IOException if an error occurs while reading the data
-     * @throws RuntimeException a number of other exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of other exceptions can be thrown, especially if there are problems with the
      * input format
      */
     public static Workbook create(final DirectoryNode root) throws IOException {
@@ -145,7 +145,7 @@ public final class WorkbookFactory {
      * @return The created Workbook
      *
      * @throws IOException if an error occurs while reading the data
-     * @throws RuntimeException a number of runtime exceptions can be thrown, especially if there are problems with the
+     * @throws IllegalStateException a number of runtime exceptions can be thrown, especially if there are problems with the
      * input format
      */
     public static Workbook create(final DirectoryNode root, String password) throws IOException {
@@ -178,7 +178,7 @@ public final class WorkbookFactory {
      *  @throws IOException if an error occurs while reading the data
      *  @throws EncryptedDocumentException If the Workbook given is password protected
      *  @throws EmptyFileException If the given data is empty
-     *  @throws RuntimeException a number of other runtime exceptions can be thrown, especially if there are problems with the
+     *  @throws IllegalStateException a number of other runtime exceptions can be thrown, especially if there are problems with the
      *  input format
      */
     public static Workbook create(InputStream inp) throws IOException, EncryptedDocumentException {
@@ -207,7 +207,7 @@ public final class WorkbookFactory {
      *  @throws IOException if an error occurs while reading the data
      *  @throws EncryptedDocumentException If the wrong password is given for a protected file
      *  @throws EmptyFileException If the given data is empty
-     *  @throws RuntimeException a number of other runtime exceptions can be thrown, especially if there are problems with the
+     *  @throws IllegalStateException a number of other runtime exceptions can be thrown, especially if there are problems with the
      *  input format
      */
     public static Workbook create(InputStream inp, String password) throws IOException, EncryptedDocumentException {
@@ -248,7 +248,7 @@ public final class WorkbookFactory {
      *  @throws IOException if an error occurs while reading the data
      *  @throws EncryptedDocumentException If the Workbook given is password protected
      *  @throws EmptyFileException If the given data is empty
-     *  @throws RuntimeException a number of other runtime exceptions can be thrown, especially if there are problems with the
+     *  @throws IllegalStateException a number of other runtime exceptions can be thrown, especially if there are problems with the
      *  input format
      */
     public static Workbook create(File file) throws IOException, EncryptedDocumentException {
@@ -270,7 +270,7 @@ public final class WorkbookFactory {
      *  @throws IOException if an error occurs while reading the data
      *  @throws EncryptedDocumentException If the wrong password is given for a protected file
      *  @throws EmptyFileException If the given data is empty
-     *  @throws RuntimeException a number of other runtime exceptions can be thrown, especially if there are problems with the
+     *  @throws IllegalStateException a number of other runtime exceptions can be thrown, especially if there are problems with the
      *  input format
      */
     public static Workbook create(File file, String password) throws IOException, EncryptedDocumentException {
@@ -294,7 +294,7 @@ public final class WorkbookFactory {
      *  @throws IOException if an error occurs while reading the data
      *  @throws EncryptedDocumentException If the wrong password is given for a protected file
      *  @throws EmptyFileException If the given data is empty
-     *  @throws RuntimeException a number of other runtime exceptions can be thrown, especially if there are problems with the
+     *  @throws IllegalStateException a number of other runtime exceptions can be thrown, especially if there are problems with the
      *  input format
      */
     public static Workbook create(File file, String password, boolean readOnly) throws IOException, EncryptedDocumentException {
diff --git a/poi/src/main/java/org/apache/poi/util/LittleEndianInputStream.java b/poi/src/main/java/org/apache/poi/util/LittleEndianInputStream.java
index e6d1a84cb7..cc2c3b927f 100644
--- a/poi/src/main/java/org/apache/poi/util/LittleEndianInputStream.java
+++ b/poi/src/main/java/org/apache/poi/util/LittleEndianInputStream.java
@@ -97,7 +97,7 @@ public class LittleEndianInputStream extends FilterInputStream implements Little
      * get an unsigned int value from an InputStream
      *
      * @return the unsigned int (32-bit) value
-     * @throws RuntimeException
+     * @throws IllegalStateException
      *                wraps any IOException thrown from reading the stream.
      */
     //@Override
diff --git a/poi/src/test/java/org/apache/poi/POIDataSamples.java b/poi/src/test/java/org/apache/poi/POIDataSamples.java
index 41421a3fe2..82e06bd57d 100644
--- a/poi/src/test/java/org/apache/poi/POIDataSamples.java
+++ b/poi/src/test/java/org/apache/poi/POIDataSamples.java
@@ -160,7 +160,7 @@ public final class POIDataSamples {
      *
      * @param sampleFileName    the name of the test file
      * @return Verifies that the file with the given name exists in the test-data directory
-     * @throws RuntimeException if the file was not found
+     * @throws IllegalStateException if the file was not found
      */
     public File getFile(String sampleFileName) {
         File f = new File(_resolvedDataDir, sampleFileName);