diff --git a/src/background/zcl_abapgit_background.clas.abap b/src/background/zcl_abapgit_background.clas.abap
index b1e574c54..e3f3c0aef 100644
--- a/src/background/zcl_abapgit_background.clas.abap
+++ b/src/background/zcl_abapgit_background.clas.abap
@@ -147,14 +147,13 @@ CLASS zcl_abapgit_background IMPLEMENTATION.
           lo_repo->refresh(
             iv_drop_cache = abap_true
             iv_drop_log   = abap_false ).
-
-          " Clear auth buffer to allow different user/password per repository in background mode
-          zcl_abapgit_login_manager=>clear( ).
-
         CATCH zcx_abapgit_exception INTO lx_error.
           li_log->add_exception( lx_error ).
       ENDTRY.
 
+      " Clear auth buffer to allow different user/password per repository in background mode
+      zcl_abapgit_login_manager=>clear( ).
+
       zcl_abapgit_log_viewer=>write_log( li_log ).
     ENDLOOP.