diff --git a/src/objects/aff/zcl_abapgit_object_common_aff.clas.abap b/src/objects/aff/zcl_abapgit_object_common_aff.clas.abap
index 69ec3f546..16be45052 100644
--- a/src/objects/aff/zcl_abapgit_object_common_aff.clas.abap
+++ b/src/objects/aff/zcl_abapgit_object_common_aff.clas.abap
@@ -80,14 +80,15 @@ CLASS ZCL_ABAPGIT_OBJECT_COMMON_AFF IMPLEMENTATION.
 
         LOOP AT <ls_messages> ASSIGNING <ls_message>.
           ASSIGN COMPONENT 'MESSAGE' OF STRUCTURE <ls_message> TO <ls_msg>.
-          CHECK <ls_msg>-msgty = 'E'.
-          zcx_abapgit_exception=>raise_t100(
-             iv_msgid    = <ls_msg>-msgid
-             iv_msgno    = <ls_msg>-msgno
-             iv_msgv1    = <ls_msg>-msgv1
-             iv_msgv2    = <ls_msg>-msgv2
-             iv_msgv3    = <ls_msg>-msgv3
-             iv_msgv4    = <ls_msg>-msgv4  ).
+          IF <ls_msg>-msgty = 'E'.
+            zcx_abapgit_exception=>raise_t100(
+              iv_msgid    = <ls_msg>-msgid
+              iv_msgno    = <ls_msg>-msgno
+              iv_msgv1    = <ls_msg>-msgv1
+              iv_msgv2    = <ls_msg>-msgv2
+              iv_msgv3    = <ls_msg>-msgv3
+              iv_msgv4    = <ls_msg>-msgv4 ).
+          ENDIF.
         ENDLOOP.
 
         CALL FUNCTION 'TR_TADIR_INTERFACE'
@@ -138,7 +139,8 @@ CLASS ZCL_ABAPGIT_OBJECT_COMMON_AFF IMPLEMENTATION.
                    <ls_messages>             TYPE ANY TABLE,
                    <ls_message>              TYPE any,
                    <ls_text>                 TYPE any,
-                   <ls_type>                 TYPE any.
+                   <ls_type>                 TYPE any,
+                   <ls_msg>                  TYPE symsg.
 
     lv_json_as_xstring = zif_abapgit_object~mo_files->read_raw( iv_ext = 'json' ).
 
@@ -218,12 +220,23 @@ CLASS ZCL_ABAPGIT_OBJECT_COMMON_AFF IMPLEMENTATION.
             messages = <ls_messages>.
 
         LOOP AT <ls_messages> ASSIGNING <ls_message>.
+          ASSIGN COMPONENT 'MESSAGE' OF STRUCTURE <ls_message> TO <ls_msg>.
           ASSIGN COMPONENT 'TEXT' OF STRUCTURE <ls_message> TO <ls_text>.
           ASSIGN COMPONENT 'TYPE' OF STRUCTURE <ls_message> TO <ls_type>.
           ii_log->add(
               iv_msg  = <ls_text>
               iv_type = <ls_type>
               is_item = ms_item ).
+
+          IF <ls_msg>-msgty = 'E'.
+            zcx_abapgit_exception=>raise_t100(
+              iv_msgid    = <ls_msg>-msgid
+              iv_msgno    = <ls_msg>-msgno
+              iv_msgv1    = <ls_msg>-msgv1
+              iv_msgv2    = <ls_msg>-msgv2
+              iv_msgv3    = <ls_msg>-msgv3
+              iv_msgv4    = <ls_msg>-msgv4 ).
+          ENDIF.
         ENDLOOP.
 
         tadir_insert( ms_item-devclass ).
@@ -400,14 +413,15 @@ CLASS ZCL_ABAPGIT_OBJECT_COMMON_AFF IMPLEMENTATION.
 
         LOOP AT <ls_messages> ASSIGNING <ls_message>.
           ASSIGN COMPONENT 'MESSAGE' OF STRUCTURE <ls_message> TO <ls_msg>.
-          CHECK <ls_msg>-msgty = 'E'.
-          zcx_abapgit_exception=>raise_t100(
-             iv_msgid    = <ls_msg>-msgid
-             iv_msgno    = <ls_msg>-msgno
-             iv_msgv1    = <ls_msg>-msgv1
-             iv_msgv2    = <ls_msg>-msgv2
-             iv_msgv3    = <ls_msg>-msgv3
-             iv_msgv4    = <ls_msg>-msgv4  ).
+          IF <ls_msg>-msgty = 'E'.
+            zcx_abapgit_exception=>raise_t100(
+              iv_msgid    = <ls_msg>-msgid
+              iv_msgno    = <ls_msg>-msgno
+              iv_msgv1    = <ls_msg>-msgv1
+              iv_msgv2    = <ls_msg>-msgv2
+              iv_msgv3    = <ls_msg>-msgv3
+              iv_msgv4    = <ls_msg>-msgv4 ).
+          ENDIF.
         ENDLOOP.
 
         CALL METHOD lo_files_container->('IF_AFF_FILES_CONTAINER~GET_FILE')