1 files changed, 12 insertions, 0 deletions
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
index 8933adf26aa8..5f8b91ccb599 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
@@ -109,6 +109,12 @@ public class OfficeGroupLayoutController extends SectionLayoutController
 
             final OfficeGroup group = (OfficeGroup) getElement();
             final OfficeGroupSection header = group.getHeader();
+
+            if (header == null)
+            {
+                return controller;
+            }
+
             controller.waitForJoin = true;
             return processChild(controller, header, getFlowController());
         }
@@ -127,6 +133,12 @@ public class OfficeGroupLayoutController extends SectionLayoutController
 
             final OfficeGroup group = (OfficeGroup) getElement();
             final OfficeGroupSection footer = group.getFooter();
+
+            if (footer == null)
+            {
+                return controller;
+            }
+
             controller.waitForJoin = true;
             return processChild(controller, footer, getFlowController());
         }