diff --git a/src/cts/zcl_abapgit_transport_objects.clas.abap b/src/cts/zcl_abapgit_transport_objects.clas.abap
index 41d72ca59..301eac159 100644
--- a/src/cts/zcl_abapgit_transport_objects.clas.abap
+++ b/src/cts/zcl_abapgit_transport_objects.clas.abap
@@ -45,8 +45,9 @@ CLASS zcl_abapgit_transport_objects IMPLEMENTATION.
         CASE ls_object_status-lstate.
           WHEN zif_abapgit_definitions=>c_state-added OR zif_abapgit_definitions=>c_state-modified.
             IF ls_transport_object-delflag = abap_true.
-              zcx_abapgit_exception=>raise( |Object { ls_transport_object-obj_name
-                } should be added/modified, but has deletion flag in transport| ).
+              zcx_abapgit_exception=>raise( |Object { ls_transport_object-object }|
+                && | { ls_transport_object-obj_name } should be added/modified,|
+                && | but has deletion flag in transport| ).
             ENDIF.
 
             READ TABLE is_stage_objects-local
@@ -55,8 +56,8 @@ CLASS zcl_abapgit_transport_objects IMPLEMENTATION.
                        item-obj_type = ls_transport_object-object
                        file-filename = ls_object_status-filename.
             IF sy-subrc <> 0.
-              zcx_abapgit_exception=>raise( |Object { ls_transport_object-obj_name
-                } not found in the local repository files| ).
+              zcx_abapgit_exception=>raise( |Object { ls_transport_object-object }|
+                && | { ls_transport_object-obj_name } not found in the local repository files| ).
             ELSE.
               io_stage->add(
                 iv_path     = ls_local_file-file-path
@@ -71,8 +72,9 @@ CLASS zcl_abapgit_transport_objects IMPLEMENTATION.
                 AND ls_transport_object-object <> 'IWMO'
                 AND ls_transport_object-object <> 'IWSG'
                 AND ls_transport_object-object <> 'IWSV'.
-              zcx_abapgit_exception=>raise( |Object { ls_transport_object-obj_name
-                } should be removed, but has NO deletion flag in transport| ).
+              zcx_abapgit_exception=>raise( |Object { ls_transport_object-object }|
+                && | { ls_transport_object-obj_name } should be removed,|
+                && | but has NO deletion flag in transport| ).
             ENDIF.
             io_stage->rm(
               iv_path     = ls_object_status-path
diff --git a/src/cts/zcl_abapgit_transport_objects.clas.testclasses.abap b/src/cts/zcl_abapgit_transport_objects.clas.testclasses.abap
index 1a78235c5..b770f6fd0 100644
--- a/src/cts/zcl_abapgit_transport_objects.clas.testclasses.abap
+++ b/src/cts/zcl_abapgit_transport_objects.clas.testclasses.abap
@@ -184,7 +184,7 @@ CLASS ltcl_transport_objects IMPLEMENTATION.
       iv_filename = 'CL_FOO.abap'
       iv_path     = '/path'
       iv_data     = 'data' ).
-    then_it_should_raise_exception( 'Object CL_FOO not found in the local repository files' ).
+    then_it_should_raise_exception( 'Object CLAS CL_FOO not found in the local repository files' ).
   ENDMETHOD.
 
   METHOD cant_be_added_with_del_flag.
@@ -198,7 +198,7 @@ CLASS ltcl_transport_objects IMPLEMENTATION.
       iv_obj_type   = 'CLAS'
       iv_lstate     = zif_abapgit_definitions=>c_state-added ).
 
-    then_it_should_raise_exception( 'Object CL_FOO should be added/modified, but has deletion flag in transport' ).
+    then_it_should_raise_exception( 'Object CLAS CL_FOO should be added/modified, but has deletion flag in transport' ).
   ENDMETHOD.
 
   METHOD cant_be_modified_with_del_flag.
@@ -212,7 +212,7 @@ CLASS ltcl_transport_objects IMPLEMENTATION.
       iv_obj_type   = 'CLAS'
       iv_lstate     = zif_abapgit_definitions=>c_state-modified ).
 
-    then_it_should_raise_exception( 'Object CL_FOO should be added/modified, but has deletion flag in transport' ).
+    then_it_should_raise_exception( 'Object CLAS CL_FOO should be added/modified, but has deletion flag in transport' ).
   ENDMETHOD.
 
   METHOD deleted_to_removed_files.
@@ -360,7 +360,7 @@ CLASS ltcl_transport_objects IMPLEMENTATION.
       iv_path       = '/a_path'
       iv_lstate     = zif_abapgit_definitions=>c_state-deleted ).
 
-    then_it_should_raise_exception( 'Object CL_FOO should be removed, but has NO deletion flag in transport' ).
+    then_it_should_raise_exception( 'Object CLAS CL_FOO should be removed, but has NO deletion flag in transport' ).
   ENDMETHOD.
 
   METHOD given_the_transport_object.