diff --git a/src/zcl_excel_drawing.clas.abap b/src/zcl_excel_drawing.clas.abap
index 2999649..f2c9c80 100644
--- a/src/zcl_excel_drawing.clas.abap
+++ b/src/zcl_excel_drawing.clas.abap
@@ -398,6 +398,7 @@ CLASS ZCL_EXCEL_DRAWING IMPLEMENTATION.
         CREATE OBJECT lo_linechart.
         me->graph = lo_linechart.
       WHEN OTHERS.
+        RETURN.
     ENDCASE.
 
     "Fill properties
diff --git a/src/zcl_excel_reader_2007.clas.abap b/src/zcl_excel_reader_2007.clas.abap
index 0c7c40f..84d6b3a 100644
--- a/src/zcl_excel_reader_2007.clas.abap
+++ b/src/zcl_excel_reader_2007.clas.abap
@@ -827,6 +827,7 @@ CLASS zcl_excel_reader_2007 IMPLEMENTATION.
         ip_height = ls_size-height ).
 
     IF drawing_type = zcl_excel_drawing=>type_chart.
+      lo_drawing->graph_type = 255.
 *  Begin fix for Issue #551
       DATA: lo_tmp_node_2                TYPE REF TO if_ixml_element.
       lo_tmp_node_2 ?= rel_drawing-content_xml->find_from_name_ns( name = 'pieChart' uri = namespace-c ).