diff --git a/odex25_takaful/odex_takaful/models/takaful_sponorship_model.py b/odex25_takaful/odex_takaful/models/takaful_sponorship_model.py
index 2094bbc9d..ed9f06ba2 100644
--- a/odex25_takaful/odex_takaful/models/takaful_sponorship_model.py
+++ b/odex25_takaful/odex_takaful/models/takaful_sponorship_model.py
@@ -1344,10 +1344,12 @@ class TakafulSponsorship(models.Model):
                 _("Please add at least one line in donation details!")
             )
         #Check if The Total Amount is not Zero
-        if self.total_sponsorship_amount == 0:
-            raise ValidationError(
-                _("Please Check The Amount  in donation Line!")
-            )
+        all_line = self.donations_details_lines + self.donations_details_lines_mechanism_ids
+        for line in all_line:
+            if line.total_donation_amount == 0:
+                raise ValidationError(
+                    _("Please Check The Amount  in donation Line!")
+                )
 
         if not self.code:
             self.code = self.env['ir.sequence'].sudo().next_by_code('sponsorship.sequence')
diff --git a/odex25_takaful/odex_takaful/wizards/donation_extension_wizard.py b/odex25_takaful/odex_takaful/wizards/donation_extension_wizard.py
index 4e6b4698b..61e453607 100644
--- a/odex25_takaful/odex_takaful/wizards/donation_extension_wizard.py
+++ b/odex25_takaful/odex_takaful/wizards/donation_extension_wizard.py
@@ -155,7 +155,8 @@ class DonationExtensionWizard(models.TransientModel):
         """
         for rec in self:
             for line in rec.line_ids:
-                line.cancel_extension()
+                if line.extension_invoice_id:
+                    line.cancel_extension()
 
         return {'type': 'ir.actions.act_window_close'}