diff --git a/src/zabapgit_folder_logic.prog.abap b/src/zabapgit_folder_logic.prog.abap
index aabbf99b0..2da75200c 100644
--- a/src/zabapgit_folder_logic.prog.abap
+++ b/src/zabapgit_folder_logic.prog.abap
@@ -113,12 +113,17 @@ CLASS lcl_folder_logic IMPLEMENTATION.
 
         lv_path = iv_package+lv_len.
         IF strlen( lv_path ) = 0.
-          zcx_abapgit_exception=>raise( 'Folder logic: length = 0' ).
+          zcx_abapgit_exception=>raise( |Folder logic: length = 0, parent: {
+            lv_parentcl }, child: { iv_package }| ).
         ENDIF.
 
         IF lv_path(1) = '_'.
           lv_path = lv_path+1.
         ENDIF.
+        IF strlen( lv_path ) = 0.
+          zcx_abapgit_exception=>raise( |Folder logic: length = 0, parent: {
+            lv_parentcl }, child: { iv_package }| ).
+        ENDIF.
 
         TRANSLATE lv_path USING '/#'.
         TRANSLATE lv_path TO LOWER CASE.