diff --git a/src/zabapgit_repo.prog.abap b/src/zabapgit_repo.prog.abap
index 0a69cf0ed..6ba1d98e3 100644
--- a/src/zabapgit_repo.prog.abap
+++ b/src/zabapgit_repo.prog.abap
@@ -235,7 +235,7 @@ CLASS lcl_repo_srv DEFINITION FINAL CREATE PRIVATE FRIENDS lcl_app.
 
     METHODS is_sap_object_allowed
       RETURNING
-        VALUE(r_is_sap_object_allowed) TYPE abap_bool.
+        VALUE(rv_allowed) TYPE abap_bool.
 
     METHODS add
       IMPORTING io_repo TYPE REF TO lcl_repo
diff --git a/src/zabapgit_repo_impl.prog.abap b/src/zabapgit_repo_impl.prog.abap
index 243bf39df..44e2d3ed5 100644
--- a/src/zabapgit_repo_impl.prog.abap
+++ b/src/zabapgit_repo_impl.prog.abap
@@ -1052,7 +1052,7 @@ CLASS lcl_repo_srv IMPLEMENTATION.
         EXPORTING
           is_data = lo_repo->ms_data.
     ELSE. " OFFline -> On-line
-      lo_repo->set( iv_offline     = abap_false ).
+      lo_repo->set( iv_offline = abap_false ).
       CREATE OBJECT <repo> TYPE lcl_repo_online
         EXPORTING
           is_data = lo_repo->ms_data.
@@ -1063,7 +1063,12 @@ CLASS lcl_repo_srv IMPLEMENTATION.
 
   METHOD is_sap_object_allowed.
 
-    r_is_sap_object_allowed = lcl_exit=>get_instance( )->allow_sap_objects( ).
+    rv_allowed = cl_enh_badi_def_utility=>is_sap_system( ).
+    IF rv_allowed = abap_true.
+      RETURN.
+    ENDIF.
+
+    rv_allowed = lcl_exit=>get_instance( )->allow_sap_objects( ).
 
   ENDMETHOD.