diff --git a/src/ui/zcl_abapgit_gui_page_stage.clas.abap b/src/ui/zcl_abapgit_gui_page_stage.clas.abap
index 1849312d3..0901839d2 100644
--- a/src/ui/zcl_abapgit_gui_page_stage.clas.abap
+++ b/src/ui/zcl_abapgit_gui_page_stage.clas.abap
@@ -600,7 +600,12 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_STAGE IMPLEMENTATION.
         WITH TABLE KEY
           path     = ls_file-path
           filename = ls_file-filename.
-      ASSERT sy-subrc = 0.
+      IF sy-subrc <> 0.
+* see https://github.com/larshp/abapGit/issues/3073
+        zcx_abapgit_exception=>raise( iv_text =
+          |Unable to stage { ls_file-filename }. If the filename contains spaces, this is a known issue.| &&
+          | Consider ignoring or staging the file at a later time.| ).
+      ENDIF.
 
       CASE <ls_item>-value.
         WHEN zif_abapgit_definitions=>c_method-add.