diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/model/StylesTable.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/StylesTable.java
index 3201544192..99a9e37756 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/model/StylesTable.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/StylesTable.java
@@ -841,14 +841,15 @@ public class StylesTable extends POIXMLDocumentPart implements Styles {
      * @return defined style, either explicit or built-in, or null if not found
      *
      * @since 3.17 beta 1
+     * @throws IllegalArgumentException if there is no explicit table style but the name is an
+     * unknown built-in style
      */
     public TableStyle getTableStyle(String name) {
         if (name == null) return null;
-        try {
-            return XSSFBuiltinTableStyle.valueOf(name).getStyle();
-        } catch (IllegalArgumentException e) {
-            return getExplicitTableStyle(name);
-        }
+        TableStyle tableStyle = getExplicitTableStyle(name);
+        if (tableStyle == null)
+            tableStyle = XSSFBuiltinTableStyle.valueOf(name).getStyle();
+        return tableStyle;
     }
 
     /**