diff --git a/src/zcl_excel_writer_2007.clas.abap b/src/zcl_excel_writer_2007.clas.abap
index 35e4cd3..e1e3cc4 100644
--- a/src/zcl_excel_writer_2007.clas.abap
+++ b/src/zcl_excel_writer_2007.clas.abap
@@ -4534,7 +4534,7 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
 
       lo_element_2->append_child( new_child = lo_element_3 ). " column node
     ENDLOOP.
-    IF sy-subrc = 0.
+    IF sy-subrc = 0 AND ls_last_row-cell_row IS NOT INITIAL.
       READ TABLE lt_values INTO ls_values WITH KEY column = ls_last_row-cell_column.
       IF sy-subrc = 0 AND ls_values-value = ls_last_row-cell_value.
         CLEAR l_autofilter_hidden.