diff --git a/src/zabapgit.prog.xml b/src/zabapgit.prog.xml
index b47a5359e..1f91d506d 100644
--- a/src/zabapgit.prog.xml
+++ b/src/zabapgit.prog.xml
@@ -12,7 +12,6 @@
     <LDBNAME>D$S</LDBNAME>
     <UCCHECK>X</UCCHECK>
    </PROGDIR>
-   <DYNPROS/>
    <TPOOL>
     <item>
      <ID>R</ID>
diff --git a/src/zabapgit_object_oo_functions.prog.abap b/src/zabapgit_object_oo_functions.prog.abap
index d9de940a1..f0ac47638 100644
--- a/src/zabapgit_object_oo_functions.prog.abap
+++ b/src/zabapgit_object_oo_functions.prog.abap
@@ -547,9 +547,11 @@ CLASS lcl_object_oriented_base IMPLEMENTATION.
         rt_source = lo_oo_serializer->serialize_abap_clif_source( is_class_key ).
     ENDCASE.
   ENDMETHOD.
+
   METHOD lif_object_oriented_object_fnc~get_skip_test_classes.
     rv_skip = mv_skip_test_classes.
   ENDMETHOD.
+
   METHOD lif_object_oriented_object_fnc~get_class_properties.
     ASSERT 0 = 1. "Subclass responsibility
   ENDMETHOD.
diff --git a/src/zabapgit_xml.prog.abap b/src/zabapgit_xml.prog.abap
index edcd55efc..3579df410 100644
--- a/src/zabapgit_xml.prog.abap
+++ b/src/zabapgit_xml.prog.abap
@@ -215,6 +215,10 @@ CLASS lcl_xml_output IMPLEMENTATION.
 
     ASSERT NOT iv_name IS INITIAL.
 
+    IF ig_data IS INITIAL.
+      RETURN.
+    ENDIF.
+
     APPEND INITIAL LINE TO lt_stab ASSIGNING <ls_stab>.
     <ls_stab>-name = iv_name.
     GET REFERENCE OF ig_data INTO <ls_stab>-value.