diff --git a/EnvelopeGenerator.GeneratorAPI/Controllers/ReceiverController.cs b/EnvelopeGenerator.GeneratorAPI/Controllers/ReceiverController.cs
index cea340e8..40f973c5 100644
--- a/EnvelopeGenerator.GeneratorAPI/Controllers/ReceiverController.cs
+++ b/EnvelopeGenerator.GeneratorAPI/Controllers/ReceiverController.cs
@@ -29,13 +29,21 @@ namespace EnvelopeGenerator.GeneratorAPI.Controllers
             if (emailAddress is null && signature is null)
                 return await base.GetAll();
 
-            return await _service.ReadByAsync(emailAddress: emailAddress, signature: signature).ThenAsync(
-                    Success: Ok,
-                    Fail: IActionResult (msg,ntc) =>
-                    {
-                        _logger.LogNotice(ntc);
-                        return StatusCode(StatusCodes.Status500InternalServerError);
-                    });
+            try
+            {
+                return await _service.ReadByAsync(emailAddress: emailAddress, signature: signature).ThenAsync(
+                        Success: Ok,
+                        Fail: IActionResult (msg, ntc) =>
+                        {
+                            _logger.LogNotice(ntc);
+                            return StatusCode(StatusCodes.Status500InternalServerError);
+                        });
+            }
+            catch
+            {
+                _logger.LogError(ex, "{Message}", ex.Message);
+                return StatusCode(500);
+            }
         }
 
         [HttpPost]
@@ -59,14 +67,22 @@ namespace EnvelopeGenerator.GeneratorAPI.Controllers
             if(id is int id_int)
                 return await base.Delete(id_int);
 
-            if (emailAddress is not null && signature is not null)
-                return await _service.DeleteByAsync(emailAddress: emailAddress, signature: signature).ThenAsync(
-                    Success: Ok,
-                    Fail: IActionResult (msg, ntc) =>
-                    {
-                        _logger.LogNotice(ntc);
-                        return StatusCode(StatusCodes.Status500InternalServerError);
-                    });
+            try
+            {
+                if (emailAddress is not null || signature is not null)
+                    return await _service.DeleteByAsync(emailAddress: emailAddress, signature: signature).ThenAsync(
+                        Success: Ok,
+                        Fail: IActionResult (msg, ntc) =>
+                        {
+                            _logger.LogNotice(ntc);
+                            return StatusCode(StatusCodes.Status500InternalServerError);
+                        });
+            }
+            catch(Exception ex)
+            {
+                _logger.LogError(ex, "{Message}", ex.Message);
+                return StatusCode(500);
+            }
 
             return BadRequest();
         }