diff --git a/src/zabapgit_objects.prog.abap b/src/zabapgit_objects.prog.abap
index a5ff0f45f..dd8377393 100644
--- a/src/zabapgit_objects.prog.abap
+++ b/src/zabapgit_objects.prog.abap
@@ -1570,8 +1570,8 @@ CLASS lcl_objects_saxx_super IMPLEMENTATION.
 
     DATA: lr_data TYPE REF TO data.
 
-    FIELD-SYMBOLS: <lg_data>    TYPE any,
-                   <lg_header>  TYPE any,
+    FIELD-SYMBOLS: <lg_data>       TYPE any,
+                   <lg_header>     TYPE any,
                    <lg_changed_by> TYPE any.
 
     create_channel_objects( ).
@@ -1593,7 +1593,11 @@ CLASS lcl_objects_saxx_super IMPLEMENTATION.
     ASSIGN COMPONENT 'CHANGED_BY' OF STRUCTURE <lg_header> TO <lg_changed_by>.
     ASSERT sy-subrc = 0.
 
-    rv_user = <lg_changed_by>.
+    IF <lg_changed_by> IS NOT INITIAL.
+      rv_user = <lg_changed_by>.
+    ELSE.
+      rv_user = c_user_unknown.
+    ENDIF.
 
   ENDMETHOD.