diff --git a/src/zcl_excel_worksheet.clas.abap b/src/zcl_excel_worksheet.clas.abap
index 0725a97..39af1c6 100644
--- a/src/zcl_excel_worksheet.clas.abap
+++ b/src/zcl_excel_worksheet.clas.abap
@@ -1868,7 +1868,7 @@ CLASS zcl_excel_worksheet IMPLEMENTATION.
     READ TABLE sheet_content INTO ls_sheet_content WITH TABLE KEY cell_row     = ip_row
                                                                   cell_column  = lv_column.
 
-    ep_rc = sy-subrc.
+    ep_rc       = sy-subrc.
     ep_value    = ls_sheet_content-cell_value.
     ep_guid     = ls_sheet_content-cell_style.       " issue 139 - added this to be used for columnwidth calculation
     ep_formula  = ls_sheet_content-cell_formula.
@@ -1876,9 +1876,10 @@ CLASS zcl_excel_worksheet IMPLEMENTATION.
     " Addition to solve issue #120, contribution by Stefan Schmöcker
     DATA: style_iterator TYPE REF TO cl_object_collection_iterator,
           style          TYPE REF TO zcl_excel_style.
-    IF ep_style IS REQUESTED.
+    IF ep_style IS SUPPLIED.
+      CLEAR ep_style.
       style_iterator = me->excel->get_styles_iterator( ).
-      WHILE style_iterator->has_next( ) = 'X'.
+      WHILE style_iterator->has_next( ) = abap_true.
         style ?= style_iterator->get_next( ).
         IF style->get_guid( ) = ls_sheet_content-cell_style.
           ep_style = style.