diff --git a/EnvelopeGenerator.Application/SQL/DocumentCreateReadSQL.cs b/EnvelopeGenerator.Application/SQL/DocumentCreateReadSQL.cs
index ed682b0e..468055c5 100644
--- a/EnvelopeGenerator.Application/SQL/DocumentCreateReadSQL.cs
+++ b/EnvelopeGenerator.Application/SQL/DocumentCreateReadSQL.cs
@@ -1,5 +1,6 @@
 using Dapper;
 using EnvelopeGenerator.Application.Contracts.SQLExecutor;
+using EnvelopeGenerator.Application.Exceptions;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.SQL;
@@ -34,9 +35,16 @@ public class DocumentCreateReadSQL : ISQL<EnvelopeDocument>
     /// <returns></returns>
     public static DynamicParameters CreateParmas(string base64)
     {
-        var parameters = new DynamicParameters();
-        byte[] byteData = Convert.FromBase64String(base64);
-        parameters.Add("ByteData", byteData, System.Data.DbType.Binary);
-        return parameters;
+        try
+        {
+            var parameters = new DynamicParameters();
+            byte[] byteData = Convert.FromBase64String(base64);
+            parameters.Add("ByteData", byteData, System.Data.DbType.Binary);
+            return parameters;
+        }
+        catch(FormatException ex)
+        {
+            throw new BadRequestException(ex.Message.Replace("input", "dataAsBase64"));
+        }
     }
 }
diff --git a/EnvelopeGenerator.GeneratorAPI/Controllers/HistoryController.cs b/EnvelopeGenerator.GeneratorAPI/Controllers/HistoryController.cs
index c738b6e2..7f7b324d 100644
--- a/EnvelopeGenerator.GeneratorAPI/Controllers/HistoryController.cs
+++ b/EnvelopeGenerator.GeneratorAPI/Controllers/HistoryController.cs
@@ -109,9 +109,7 @@ public class HistoryController : ControllerBase
     {
         bool withReceiver = false;
         bool withSender = false;
-
-
-
+        
         switch (history.Related)
         {
             case ReferenceType.Receiver: