diff --git a/spp_change_request/models/change_request.py b/spp_change_request/models/change_request.py
index 7e8652636..1b318e83b 100644
--- a/spp_change_request/models/change_request.py
+++ b/spp_change_request/models/change_request.py
@@ -857,11 +857,12 @@ def approve_cr(self):
 
         Usage:
         - Call this function via XMLRPC
+        :raise ValidationError: Exception raised when user is allowed to directly approve the CR.
         """
         self.ensure_one()
         # Check if user is allowed to directly approve the CR
         if not self.env.user.has_group("spp_change_request.group_spp_change_request_external_api"):
-            ValidationError("User is not allowed to approve CRs directly.")
+            raise ValidationError(_("User is not allowed to approve CRs directly."))
         return self.request_type_ref_id._approve_cr(self)
 
     def action_cancel(self):
@@ -931,8 +932,6 @@ def action_reset_to_draft(self):
                 name="action_reset_to_draft"
                 type="object"
             />
-
-        :raise ValidationError: Exception raised when something is not valid.
         """
         for rec in self:
             rec.request_type_ref_id._reset_to_draft(rec)
diff --git a/spp_change_request/models/dms_file.py b/spp_change_request/models/dms_file.py
index 8d9782307..a262c1849 100644
--- a/spp_change_request/models/dms_file.py
+++ b/spp_change_request/models/dms_file.py
@@ -10,10 +10,6 @@ class SPPDMSFileCustom(models.Model):
 
     change_request_id = fields.Many2one("spp.change.request", "Change Request")
 
-    def create(self, vals):
-        # _logger.info("DEBUG vals: %s", vals)
-        return super().create(vals)
-
     def action_save_and_close(self):
         return {"type": "ir.actions.act_window_close"}
 
diff --git a/spp_change_request/models/mixins/source_mixin.py b/spp_change_request/models/mixins/source_mixin.py
index 591ebd121..8477788df 100644
--- a/spp_change_request/models/mixins/source_mixin.py
+++ b/spp_change_request/models/mixins/source_mixin.py
@@ -167,8 +167,7 @@ def _on_submit(self, request):
                 }
             )
         else:
-            # TODO: @edwin Should we use UserError or ValidationError?
-            raise UserError(_("The request must be in draft state to be set to pending validation."))
+            raise ValidationError(_("The request must be in draft state to be set to pending validation."))
 
     def action_validate(self):
         """
@@ -355,7 +354,9 @@ def _approve_cr(self, request):
             request.last_activity_id.action_done()
             return {"success": _("The change request has been approved.")}
         else:
-            ValidationError("The request must be in draft, pending, or validated state for changes to be applied.")
+            raise ValidationError(
+                _("The request must be in draft, pending, or validated state for changes to be applied.")
+            )
 
     def action_cancel(self):
         """