diff --git a/src/objects/zcl_abapgit_oo_class_new.clas.abap b/src/objects/zcl_abapgit_oo_class_new.clas.abap
index 1d93f7694..730d77618 100644
--- a/src/objects/zcl_abapgit_oo_class_new.clas.abap
+++ b/src/objects/zcl_abapgit_oo_class_new.clas.abap
@@ -476,17 +476,23 @@ CLASS zcl_abapgit_oo_class_new IMPLEMENTATION.
     DATA: lv_program TYPE programm.
 
 
-    lv_program = cl_oo_classname_service=>get_ccdef_name( is_key-clsname ).
-    update_report( iv_program = lv_program
-                   it_source  = it_local_definitions ).
+    IF lines( it_local_definitions ) > 0.
+      lv_program = cl_oo_classname_service=>get_ccdef_name( is_key-clsname ).
+      update_report( iv_program = lv_program
+                     it_source  = it_local_definitions ).
+    ENDIF.
 
-    lv_program = cl_oo_classname_service=>get_ccimp_name( is_key-clsname ).
-    update_report( iv_program = lv_program
-                   it_source  = it_local_implementations ).
+    IF lines( it_local_implementations ) > 0.
+      lv_program = cl_oo_classname_service=>get_ccimp_name( is_key-clsname ).
+      update_report( iv_program = lv_program
+                     it_source  = it_local_implementations ).
+    ENDIF.
 
-    lv_program = cl_oo_classname_service=>get_ccmac_name( is_key-clsname ).
-    update_report( iv_program = lv_program
-                   it_source  = it_local_macros ).
+    IF lines( it_local_macros ) > 0.
+      lv_program = cl_oo_classname_service=>get_ccmac_name( is_key-clsname ).
+      update_report( iv_program = lv_program
+                     it_source  = it_local_macros ).
+    ENDIF.
 
     IF lines( it_local_test_classes ) > 0.
       lv_program = cl_oo_classname_service=>get_ccau_name( is_key-clsname ).