diff --git a/src/ui/zcl_abapgit_gui_view_repo.clas.abap b/src/ui/zcl_abapgit_gui_view_repo.clas.abap
index 45be3a8f6..1ab28dc3a 100644
--- a/src/ui/zcl_abapgit_gui_view_repo.clas.abap
+++ b/src/ui/zcl_abapgit_gui_view_repo.clas.abap
@@ -380,7 +380,9 @@ CLASS zcl_abapgit_gui_view_repo IMPLEMENTATION.
       lv_master_language TYPE spras,
       lt_spagpa          TYPE STANDARD TABLE OF rfc_spagpa,
       ls_spagpa          LIKE LINE OF lt_spagpa,
-      ls_item            TYPE zif_abapgit_definitions=>ty_item.
+      ls_item            TYPE zif_abapgit_definitions=>ty_item,
+      lv_subrc           TYPE syst-subrc,
+      lv_save_sy_langu   TYPE sy-langu.
 
     " https://blogs.sap.com/2017/01/13/logon-language-sy-langu-and-rfc/
 
@@ -397,6 +399,7 @@ CLASS zcl_abapgit_gui_view_repo IMPLEMENTATION.
       zcx_abapgit_exception=>raise( |Please install the abapGit repository| ).
     ENDIF.
 
+    lv_save_sy_langu = sy-langu.
     SET LOCALE LANGUAGE lv_master_language.
 
     ls_spagpa-parid  = zif_abapgit_definitions=>c_spagpa_param_repo_key.
@@ -417,8 +420,12 @@ CLASS zcl_abapgit_gui_view_repo IMPLEMENTATION.
         system_failure          = 4
         OTHERS                  = 5.
 
-    IF sy-subrc <> 0.
-      zcx_abapgit_exception=>raise( |Error from ABAP4_CALL_TRANSACTION. Subrc = { sy-subrc }| ).
+    lv_subrc = sy-subrc.
+
+    SET LOCALE LANGUAGE lv_save_sy_langu.
+
+    IF lv_subrc <> 0.
+      zcx_abapgit_exception=>raise( |Error from ABAP4_CALL_TRANSACTION. Subrc = { lv_subrc }| ).
     ENDIF.
 
     MESSAGE 'Repository opened in a new window' TYPE 'S'.