diff --git a/src/zabapgit_object_clas.prog.abap b/src/zabapgit_object_clas.prog.abap
index 35991602c..1bb625e13 100644
--- a/src/zabapgit_object_clas.prog.abap
+++ b/src/zabapgit_object_clas.prog.abap
@@ -557,7 +557,18 @@ CLASS lcl_oo_class IMPLEMENTATION.
 * when the methods are changed
 *    APPEND cl_oo_classname_service=>get_cs_name( lv_class_name ) TO rt_includes.
 
-    lt_methods = cl_oo_classname_service=>get_all_method_includes( lv_class_name ).
+    cl_oo_classname_service=>get_all_method_includes(
+      EXPORTING
+        clsname            = lv_class_name
+      RECEIVING
+        result             = lt_methods
+      EXCEPTIONS
+        class_not_existing = 1 ).
+
+    IF sy-subrc <> 0.
+      lcx_exception=>raise( |Class { lv_class_name } not existing| ).
+    ENDIF.
+
     LOOP AT lt_methods ASSIGNING <ls_method>.
       APPEND <ls_method>-incname TO rt_includes.
     ENDLOOP.
diff --git a/src/zabapgit_object_oo_functions.prog.abap b/src/zabapgit_object_oo_functions.prog.abap
index 2d71e47c9..74a3b048a 100644
--- a/src/zabapgit_object_oo_functions.prog.abap
+++ b/src/zabapgit_object_oo_functions.prog.abap
@@ -65,7 +65,9 @@ INTERFACE lif_oo_object_fnc.
       IMPORTING
         iv_object_name     TYPE sobj_name
       RETURNING
-        VALUE(rt_includes) TYPE ty_includes_tt,
+        VALUE(rt_includes) TYPE ty_includes_tt
+      RAISING
+        lcx_exception,
     exists
       IMPORTING
         iv_object_name   TYPE seoclskey