diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/ManualRedactionSurroundingTextService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/ManualRedactionSurroundingTextService.java
index c5b2bb74..8488bd64 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/ManualRedactionSurroundingTextService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/ManualRedactionSurroundingTextService.java
@@ -22,7 +22,9 @@ import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUti
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class ManualRedactionSurroundingTextService {
@@ -88,6 +90,11 @@ public class ManualRedactionSurroundingTextService {
 
         Entity correctEntity = getEntityOnCorrectPosition(entitiesWithPositions, toFindPositions);
 
+        if(correctEntity == null){
+            log.warn("Could not calculate surrounding text");
+            return Pair.of("","");
+        }
+
         if (sectionText.getCellStarts() != null && !sectionText.getCellStarts().isEmpty()) {
             surroundingWordsService.addSurroundingText(Set.of(correctEntity), sectionText.getSearchableText(), null, sectionText
                     .getCellStarts());