diff --git a/src/objects/zcl_abapgit_object_srvb.clas.abap b/src/objects/zcl_abapgit_object_srvb.clas.abap
index 016833ec0..9fcb4de4b 100644
--- a/src/objects/zcl_abapgit_object_srvb.clas.abap
+++ b/src/objects/zcl_abapgit_object_srvb.clas.abap
@@ -41,7 +41,7 @@ CLASS zcl_abapgit_object_srvb DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje
         VALUE(ro_object_data) TYPE REF TO if_wb_object_data_model
       RAISING
         zcx_abapgit_exception .
-    METHODS      is_ai_supported
+    METHODS is_ai_supported
       RETURNING VALUE(rv_ai_supported) TYPE abap_bool.
 
     DATA:
@@ -208,7 +208,7 @@ CLASS zcl_abapgit_object_srvb IMPLEMENTATION.
   METHOD is_ai_supported.
     TRY.
         CREATE OBJECT mr_srvb_svrs_config TYPE ('CL_SRVB_SVRS_CONFIG')
-            EXPORTING iv_objtype = 'SRVB'.
+          EXPORTING iv_objtype = 'SRVB'.
       CATCH cx_sy_create_error.
         rv_ai_supported = abap_false.
     ENDTRY.
@@ -386,15 +386,26 @@ CLASS zcl_abapgit_object_srvb IMPLEMENTATION.
         IF mv_is_inactive_supported = abap_true.
           TRY.
               mi_persistence->get(
-            EXPORTING
-              p_object_key     = mv_service_binding_key
-              p_version        = 'I'
-              p_data_selection = 'ST'
-            CHANGING
-              p_object_data    = lo_object_data ).
+                EXPORTING
+                  p_object_key     = mv_service_binding_key
+                  p_version        = 'I'
+                  p_data_selection = 'ST'
+                CHANGING
+                  p_object_data    = lo_object_data ).
 
             CATCH cx_root.
               mi_persistence->get(
+                EXPORTING
+                  p_object_key     = mv_service_binding_key
+                  p_version        = 'A'
+                  p_data_selection = 'ST'
+                CHANGING
+                  p_object_data    = lo_object_data ).
+
+          ENDTRY.
+        ELSE.
+
+          mi_persistence->get(
             EXPORTING
               p_object_key     = mv_service_binding_key
               p_version        = 'A'
@@ -402,17 +413,6 @@ CLASS zcl_abapgit_object_srvb IMPLEMENTATION.
             CHANGING
               p_object_data    = lo_object_data ).
 
-          ENDTRY.
-        ELSE.
-
-          mi_persistence->get(
-        EXPORTING
-          p_object_key     = mv_service_binding_key
-          p_version        = 'A'
-          p_data_selection = 'ST'
-        CHANGING
-          p_object_data    = lo_object_data ).
-
         ENDIF.
         rv_bool = boolc( lo_object_data IS NOT INITIAL AND lo_object_data->get_object_key( ) IS NOT INITIAL ).
       CATCH cx_root.
@@ -474,7 +474,7 @@ CLASS zcl_abapgit_object_srvb IMPLEMENTATION.
     DATA:
       li_object_data_model  TYPE REF TO if_wb_object_data_model,
       li_wb_object_operator TYPE REF TO object,
-      lx_error              TYPE REF TO cx_swb_exception.
+      lx_error              TYPE REF TO cx_root.
 
     FIELD-SYMBOLS:
       <ls_service_binding> TYPE any.
@@ -497,7 +497,7 @@ CLASS zcl_abapgit_object_srvb IMPLEMENTATION.
 
         clear_fields( CHANGING cs_service_binding = <ls_service_binding> ).
 
-      CATCH cx_swb_exception INTO lx_error.
+      CATCH cx_root INTO lx_error.
         zcx_abapgit_exception=>raise_with_text( lx_error ).
     ENDTRY.