Merge branch 'hotfix/DEVSIX-1514' into develop

Author: ars18wrw

layout/src/main/java/com/itextpdf/layout/renderer/DocumentRenderer.java

@@ -116,7 +116,7 @@ protected void flushSingleRenderer(IRenderer resultRenderer) {
             return;
         }
 
-        if (!resultRenderer.isFlushed()) {
+        if (!resultRenderer.isFlushed() && null != resultRenderer.getOccupiedArea()) { // TODO Remove checking occupied area to be not null when DEVSIX-1001 is resolved.
             int pageNum = resultRenderer.getOccupiedArea().getPageNumber();
 
             PdfDocument pdfDocument = document.getPdfDocument();

layout/src/main/java/com/itextpdf/layout/renderer/TableRenderer.java

@@ -44,6 +44,7 @@ This file is part of the iText (R) project.
 package com.itextpdf.layout.renderer;
 
 import com.itextpdf.io.LogMessageConstant;
+import com.itextpdf.io.util.MessageFormatUtil;
 import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.kernel.pdf.PdfDictionary;
 import com.itextpdf.kernel.pdf.PdfDocument;
@@ -1504,7 +1505,12 @@ private void correctRowCellsOccupiedAreas(LayoutResult[] splits, int row, int[]
             float shift = height - cell.getOccupiedArea().getBBox().getHeight();
             Rectangle bBox = cell.getOccupiedArea().getBBox();
             bBox.moveDown(shift);
-            cell.move(0, -(cumulativeShift - rowspanOffset));
+            try {
+                cell.move(0, -(cumulativeShift - rowspanOffset));
+            } catch (NullPointerException npe) {  // TODO Remove try-catch when DEVSIX-1001 is resolved.
+                Logger logger = LoggerFactory.getLogger(TableRenderer.class);
+                logger.error(MessageFormatUtil.format(LogMessageConstant.OCCUPIED_AREA_HAS_NOT_BEEN_INITIALIZED, "Some of the cell's content might not end up placed correctly."));
+            }
             bBox.setHeight(height);
             cell.applyVerticalAlignment();
         }