diff --git a/src/01/02/z2ui5_cl_core_srv_json.clas.abap b/src/01/02/z2ui5_cl_core_srv_json.clas.abap
index fe84f81a..06ea30bc 100644
--- a/src/01/02/z2ui5_cl_core_srv_json.clas.abap
+++ b/src/01/02/z2ui5_cl_core_srv_json.clas.abap
@@ -162,13 +162,12 @@ CLASS z2ui5_cl_core_srv_json IMPLEMENTATION.
         ENDIF.
 
         TRY.
-            DATA(lo_comp) = result-s_front-o_comp_data.
-            if lo_comp is bound.
+            IF result-s_front-o_comp_data IS BOUND.
+              DATA(lo_comp) = result-s_front-o_comp_data.
               DATA(lv_app_start) = lo_comp->get( `/startupParameters/app_start/1` ).
-
               result-s_control-app_start = lv_app_start.
               result-s_control-app_start = z2ui5_cl_util=>c_trim_upper( result-s_control-app_start ).
-            endif.
+            ENDIF.
           CATCH cx_root.
         ENDTRY.
 
diff --git a/src/01/02/z2ui5_cl_core_srv_json.clas.testclasses.abap b/src/01/02/z2ui5_cl_core_srv_json.clas.testclasses.abap
index 57d1f693..39ed3865 100644
--- a/src/01/02/z2ui5_cl_core_srv_json.clas.testclasses.abap
+++ b/src/01/02/z2ui5_cl_core_srv_json.clas.testclasses.abap
@@ -36,4 +36,5 @@ CLASS ltcl_test IMPLEMENTATION.
                                         act = lines( lt_tree ) ).
 
   ENDMETHOD.
+
 ENDCLASS.