1 files changed, 3 insertions, 0 deletions
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/RowPainter.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/RowPainter.java
index 06dda5efe..dbb1107ef 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/RowPainter.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/RowPainter.java
@@ -198,6 +198,9 @@ class RowPainter {
      * in the outer mode
      */
     private void addAreasAndFlushRow(boolean lastInPart, boolean lastOnPage) {
+        if (currentRow == null) {
+            return;
+        }
         if (log.isDebugEnabled()) {
             log.debug("Remembering yoffset for row " + currentRow.getIndex() + ": "
                     + currentRowOffset);