diff --git a/src/01/02/z2ui5_cl_core_client.clas.abap b/src/01/02/z2ui5_cl_core_client.clas.abap
index eff41aae..110fc326 100644
--- a/src/01/02/z2ui5_cl_core_client.clas.abap
+++ b/src/01/02/z2ui5_cl_core_client.clas.abap
@@ -64,9 +64,12 @@ CLASS z2ui5_cl_core_client IMPLEMENTATION.
 
   ENDMETHOD.
 
-  METHOD z2ui5_if_client~get_event_args.
+  METHOD z2ui5_if_client~get_event_arg.
 
-    result = mo_action->ms_actual-t_event_arg[ v ].
+    TRY.
+        result = mo_action->ms_actual-t_event_arg[ v ].
+      CATCH cx_root.
+    ENDTRY.
 
   ENDMETHOD.
 
diff --git a/src/01/02/z2ui5_cl_core_http_get.clas.abap b/src/01/02/z2ui5_cl_core_http_get.clas.abap
index 885a364c..1460ce0b 100644
--- a/src/01/02/z2ui5_cl_core_http_get.clas.abap
+++ b/src/01/02/z2ui5_cl_core_http_get.clas.abap
@@ -145,15 +145,15 @@ CLASS z2ui5_cl_core_http_get IMPLEMENTATION.
                 `<script>` && |\n| &&
              `  function onInitComponent(){` && |\n| &&
              `    sap.ui.require.preload({` && |\n| &&
-             `      "z2ui5/manifest.json": '` && NEW lcl_ui5_app( )->manifest_json( ) && ` ',` && |\n| &&
-             `      "z2ui5/Component.js": function(){` && NEW lcl_ui5_app( )->component_js( ) && lv_add_js && | sap.z2ui5.JSON_MODEL_LIMIT = { cs_config-t_param[ n = 'SET_SIZE_LIMIT' ]-v };| && ` },` && |\n| &&
-             `      "z2ui5/css/style.css": function(){` && NEW lcl_ui5_app( )->css_style_css( ) && `},` && |\n| &&
-             `      "z2ui5/model/models.js": function(){` && NEW lcl_ui5_app( )->model_models_js( ) && `},` && |\n| &&
-             `      "z2ui5/i18n/i18n.properties": '` && NEW lcl_ui5_app( )->i18n_i18n_properties( ) && `' ,` && |\n| &&
-             `      "z2ui5/view/App.view.xml": '` && NEW lcl_ui5_app( )->view_app_xml( )  && `' ,` && |\n| &&
-             `      "z2ui5/controller/App.controller.js": function(){` && NEW lcl_ui5_app( )->controller_app_js( ) && `},` && |\n| &&
-             `      "z2ui5/view/View1.view.xml": '` && NEW lcl_ui5_app( )->view_view1_xml( )  && `' ,` && |\n| &&
-             `      "z2ui5/controller/View1.controller.js": function(){` && NEW lcl_ui5_app( )->controller_view1_js( ) && `},` && |\n| &&
+             `      "z2ui5/manifest.json": '` && NEW z2ui5_cl_core_ui5_app( )->manifest_json( ) && ` ',` && |\n| &&
+             `      "z2ui5/Component.js": function(){` && NEW z2ui5_cl_core_ui5_app( )->component_js( ) && lv_add_js && | sap.z2ui5.JSON_MODEL_LIMIT = { cs_config-t_param[ n = 'SET_SIZE_LIMIT' ]-v };| && ` },` && |\n| &&
+             `      "z2ui5/css/style.css": function(){` && NEW z2ui5_cl_core_ui5_app( )->css_style_css( ) && `},` && |\n| &&
+             `      "z2ui5/model/models.js": function(){` && NEW z2ui5_cl_core_ui5_app( )->model_models_js( ) && `},` && |\n| &&
+             `      "z2ui5/i18n/i18n.properties": '` && NEW z2ui5_cl_core_ui5_app( )->i18n_i18n_properties( ) && `' ,` && |\n| &&
+             `      "z2ui5/view/App.view.xml": '` && NEW z2ui5_cl_core_ui5_app( )->view_app_xml( )  && `' ,` && |\n| &&
+             `      "z2ui5/controller/App.controller.js": function(){` && NEW z2ui5_cl_core_ui5_app( )->controller_app_js( ) && `},` && |\n| &&
+             `      "z2ui5/view/View1.view.xml": '` && NEW z2ui5_cl_core_ui5_app( )->view_view1_xml( )  && `' ,` && |\n| &&
+             `      "z2ui5/controller/View1.controller.js": function(){` && NEW z2ui5_cl_core_ui5_app( )->controller_view1_js( ) && `},` && |\n| &&
              `    });` && |\n| &&
              `    sap.ui.require(["sap/ui/core/ComponentSupport"], function(ComponentSupport){` && |\n| &&
              `      ComponentSupport.run();` && |\n| &&
diff --git a/src/01/02/z2ui5_cl_core_http_get.clas.locals_imp.abap b/src/01/02/z2ui5_cl_core_ui5_app.clas.abap
similarity index 99%
rename from src/01/02/z2ui5_cl_core_http_get.clas.locals_imp.abap
rename to src/01/02/z2ui5_cl_core_ui5_app.clas.abap
index 0a74d8f5..560797ba 100644
--- a/src/01/02/z2ui5_cl_core_http_get.clas.locals_imp.abap
+++ b/src/01/02/z2ui5_cl_core_ui5_app.clas.abap
@@ -1,4 +1,7 @@
-CLASS lcl_ui5_app DEFINITION.
+CLASS z2ui5_cl_core_ui5_app DEFINITION
+  PUBLIC
+  FINAL
+  CREATE PUBLIC .
 
   PUBLIC SECTION.
 
@@ -40,7 +43,7 @@ CLASS lcl_ui5_app DEFINITION.
 
 ENDCLASS.
 
-CLASS lcl_ui5_app IMPLEMENTATION.
+CLASS z2ui5_cl_core_ui5_app IMPLEMENTATION.
 
   METHOD component_js.
 
diff --git a/src/01/02/z2ui5_cl_core_ui5_app.clas.xml b/src/01/02/z2ui5_cl_core_ui5_app.clas.xml
new file mode 100644
index 00000000..b1f1feaf
--- /dev/null
+++ b/src/01/02/z2ui5_cl_core_ui5_app.clas.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<abapGit version="v1.0.0" serializer="LCL_OBJECT_CLAS" serializer_version="v1.0.0">
+ <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
+  <asx:values>
+   <VSEOCLASS>
+    <CLSNAME>Z2UI5_CL_CORE_UI5_APP</CLSNAME>
+    <LANGU>E</LANGU>
+    <DESCRIPT>abap2UI5 - ui5 app</DESCRIPT>
+    <STATE>1</STATE>
+    <CLSCCINCL>X</CLSCCINCL>
+    <FIXPT>X</FIXPT>
+    <UNICODE>X</UNICODE>
+   </VSEOCLASS>
+  </asx:values>
+ </asx:abap>
+</abapGit>
diff --git a/src/02/z2ui5_if_client.intf.abap b/src/02/z2ui5_if_client.intf.abap
index 32205b06..28336a5d 100644
--- a/src/02/z2ui5_if_client.intf.abap
+++ b/src/02/z2ui5_if_client.intf.abap
@@ -77,7 +77,7 @@ INTERFACE z2ui5_if_client
     RETURNING
       VALUE(result) TYPE z2ui5_if_types=>ty_s_get.
 
-  METHODS get_event_args
+  METHODS get_event_arg
     IMPORTING
       v             TYPE i DEFAULT 1
     RETURNING