diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/SectionTextBuilderService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/SectionTextBuilderService.java
index 7034753e..bc550d43 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/SectionTextBuilderService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/SectionTextBuilderService.java
@@ -98,9 +98,11 @@ public class SectionTextBuilderService {
                 areas.add(sectionArea);
 
                 if (!cell.isHeaderCell()) {
-                    String headerName = getHeaderName(hasHeader, cell, table.getRows().get(0).get(cellNum));
-                    sectionArea.setHeader(headerName);
-                    tabularData.put(headerName, new CellValue(cell.getTextBlocks(), startOffset));
+                    String headerName = getHeaderName(hasHeader, cell, table.getRows().get(0), row.size(), cellNum);
+                    if(headerName != null) {
+                        sectionArea.setHeader(headerName);
+                        tabularData.put(headerName, new CellValue(cell.getTextBlocks(), startOffset));
+                    }
                 }
 
                 textBlocks.addAll(cell.getTextBlocks());
@@ -155,10 +157,17 @@ public class SectionTextBuilderService {
     }
 
 
-    private String getHeaderName(boolean hasHeader, Cell currentCell, Cell cellInFirstRow) {
+    private String getHeaderName(boolean hasHeader, Cell currentCell, List<Cell> firstRow, int currentRowSize, int cellNum) {
 
-        return hasHeader ? buildHeaderName(currentCell.getHeaderCells()
-                .get(currentCell.getHeaderCells().size() - 1)) : buildHeaderName(cellInFirstRow);
+        if (hasHeader && !currentCell.getHeaderCells().isEmpty()) {
+            return buildHeaderName(currentCell.getHeaderCells().get(currentCell.getHeaderCells().size() - 1));
+        }
+
+        if (!hasHeader && currentRowSize == firstRow.size()) {
+            return buildHeaderName(firstRow.get(cellNum));
+        }
+
+        return null;
     }