diff --git a/src/zabapgit_object_msag.prog.abap b/src/zabapgit_object_msag.prog.abap
index e14a7f751..a152f2093 100644
--- a/src/zabapgit_object_msag.prog.abap
+++ b/src/zabapgit_object_msag.prog.abap
@@ -47,7 +47,8 @@ CLASS lcl_object_msag IMPLEMENTATION.
 
     SELECT SINGLE lastuser FROM t100a INTO rv_user
       WHERE arbgb = ms_item-obj_name.                   "#EC CI_GENBUFF
-    IF sy-subrc <> 0.
+    IF sy-subrc <> 0 OR
+       rv_user EQ ''.
       rv_user = c_user_unknown.
     ENDIF.