diff --git a/src/z2ui5_cl_http_handler.clas.locals_imp.abap b/src/z2ui5_cl_http_handler.clas.locals_imp.abap
index 8467bdbc..4d967c88 100644
--- a/src/z2ui5_cl_http_handler.clas.locals_imp.abap
+++ b/src/z2ui5_cl_http_handler.clas.locals_imp.abap
@@ -1387,9 +1387,11 @@ CLASS z2ui5_lcl_fw_handler IMPLEMENTATION.
     result = NEW #( ).
     result->ms_db-id = z2ui5_lcl_utility=>get_uuid( ).
 
-    DATA(lv_path_info) = z2ui5_lcl_utility=>get_header_val( '~path_info' ).
+    TRY.
+        DATA(lv_path_info) = z2ui5_lcl_utility=>get_header_val( '~path_info' ).
+      CATCH cx_root.
+    ENDTRY.
     SPLIT lv_path_info AT `?` INTO lv_path_info DATA(lv_dummy).
-    SPLIT lv_path_info AT `/` INTO lv_path_info DATA(lv_dummy2).
     DATA(lv_classname) = z2ui5_lcl_utility=>get_trim_upper( lv_path_info ).
 
     IF lv_Classname IS INITIAL.
@@ -1397,6 +1399,8 @@ CLASS z2ui5_lcl_fw_handler IMPLEMENTATION.
       RETURN.
     ENDIF.
 
+    SPLIT lv_path_info AT `/` INTO lv_path_info DATA(lv_dummy2).
+
     TRY.
         CREATE OBJECT result->ms_db-o_app TYPE (lv_classname).
         result->ms_db-o_app->id = result->ms_db-id.