diff --git a/src/objects/zcl_abapgit_object_msag.clas.abap b/src/objects/zcl_abapgit_object_msag.clas.abap
index 995788751..a3f58f990 100644
--- a/src/objects/zcl_abapgit_object_msag.clas.abap
+++ b/src/objects/zcl_abapgit_object_msag.clas.abap
@@ -37,13 +37,17 @@ CLASS zcl_abapgit_object_msag DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje
         zcx_abapgit_exception .
     METHODS delete_msgid
       IMPORTING
-        !iv_message_id TYPE arbgb .
+        !iv_message_id TYPE arbgb
+      RAISING
+        zcx_abapgit_exception.
     METHODS free_access_permission
       IMPORTING
         !iv_message_id TYPE arbgb .
     METHODS delete_documentation
       IMPORTING
-        !iv_message_id TYPE arbgb .
+        !iv_message_id TYPE arbgb
+      RAISING
+        zcx_abapgit_exception.
 ENDCLASS.
 
 
@@ -61,9 +65,7 @@ CLASS zcl_abapgit_object_msag IMPLEMENTATION.
         element  = iv_message_id
         addition = '   '
       IMPORTING
-        object   = lv_key_s
-      EXCEPTIONS
-        OTHERS   = 0.
+        object   = lv_key_s.
 
     CALL FUNCTION 'DOKU_DELETE_ALL'
       EXPORTING
@@ -80,7 +82,11 @@ CLASS zcl_abapgit_object_msag IMPLEMENTATION.
         no_docu_found                  = 4
         object_is_already_enqueued     = 5
         object_is_enqueued_by_corr     = 6
-        user_break                     = 7.
+        user_break                     = 7
+        OTHERS                         = 8.
+    IF sy-subrc <> 0.
+      zcx_abapgit_exception=>raise( 'Error deleting longtext for message' ).
+    ENDIF.
 
   ENDMETHOD.