diff --git a/src/multimodule/examples/java9/module-info.class b/src/multimodule/examples/java9/module-info.class
index 1b5faa4b37..7f1d82fc9e 100644
Binary files a/src/multimodule/examples/java9/module-info.class and b/src/multimodule/examples/java9/module-info.class differ
diff --git a/src/multimodule/excelant/java9/module-info.class b/src/multimodule/excelant/java9/module-info.class
index 5218a9bc92..2d75c59c3f 100644
Binary files a/src/multimodule/excelant/java9/module-info.class and b/src/multimodule/excelant/java9/module-info.class differ
diff --git a/src/multimodule/excelant/test9/module-info.class b/src/multimodule/excelant/test9/module-info.class
index 5218a9bc92..2d75c59c3f 100644
Binary files a/src/multimodule/excelant/test9/module-info.class and b/src/multimodule/excelant/test9/module-info.class differ
diff --git a/src/multimodule/ooxml-lite-agent/java9/module-info.class b/src/multimodule/ooxml-lite-agent/java9/module-info.class
index fb79979654..45ff2cad38 100644
Binary files a/src/multimodule/ooxml-lite-agent/java9/module-info.class and b/src/multimodule/ooxml-lite-agent/java9/module-info.class differ
diff --git a/src/multimodule/ooxml-schemas/java9/module-info.class b/src/multimodule/ooxml-schemas/java9/module-info.class
index f2a86deda0..2bbf982025 100644
Binary files a/src/multimodule/ooxml-schemas/java9/module-info.class and b/src/multimodule/ooxml-schemas/java9/module-info.class differ
diff --git a/src/multimodule/ooxml/java9/module-info.class b/src/multimodule/ooxml/java9/module-info.class
index fd59cc5611..f88bd8cb64 100644
Binary files a/src/multimodule/ooxml/java9/module-info.class and b/src/multimodule/ooxml/java9/module-info.class differ
diff --git a/src/multimodule/ooxml/test9/module-info.class b/src/multimodule/ooxml/test9/module-info.class
index 67874cc31c..c85ff172e4 100644
Binary files a/src/multimodule/ooxml/test9/module-info.class and b/src/multimodule/ooxml/test9/module-info.class differ
diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java b/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
index 5333532c77..9e5e585c73 100644
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
+++ b/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
@@ -1908,10 +1908,14 @@ public class SXSSFSheet implements Sheet
      * @return true if the file was deleted, false if it wasn't.
      */
     boolean dispose() throws IOException {
-        if (!allFlushed) {
-            flushRows();
+        boolean ret;
+        try {
+            if (!allFlushed) {
+                flushRows();
+            }
+        } finally {
+            ret = _writer == null || _writer.dispose();
         }
-        return _writer == null || _writer.dispose();
     }
 
     @Override