diff --git a/generateChangemarks/changemarks.py b/generateChangemarks/changemarks.py
index 941b94d317fbb096a644fe0255806dc992999aac..995f589cb6530acd07fad73e05e5a9d492887b7c 100644
--- a/generateChangemarks/changemarks.py
+++ b/generateChangemarks/changemarks.py
@@ -245,11 +245,12 @@ https://forge.etsi.org/rep/cdm/pipeline-scripts/-/blob/main/common/Dockerfile.st
                         modifiedElements.append(element)
                 modifiedRow = "|".join(modifiedElements) + "\n"
                 clauseMDlines.insert(j,modifiedRow)
-                clauseMDlines.pop(j + 1)
+                clauseMDlines.pop(j + 1) # Todo Check what happens when modifying last row of a table
             else:
                 clauseMDlines.insert(j, "<span class=\"underline\">" + line.value + "</span>\n\n")
                 #clauseMDlines.insert(j, "<mark>" + line.value.strip("\n") + "</mark>\n\n")
-                clauseMDlines.pop(j+1)
+                if (j + 1) <= len(clauseMDlines):
+                    clauseMDlines.pop(j+1)
         elif (not (line.value.strip() == '') and (line.is_removed)):
             if line.value.strip().startswith("|"):  # It is a table
                 tableElements = line.value.strip().split("|")