diff --git a/EnvelopeGenerator.Common/Entities/Envelope.vb b/EnvelopeGenerator.Common/Entities/Envelope.vb
index ba7bc24e..8b8672cc 100644
--- a/EnvelopeGenerator.Common/Entities/Envelope.vb
+++ b/EnvelopeGenerator.Common/Entities/Envelope.vb
@@ -5,8 +5,10 @@
     Public Property ContractType As Constants.ContractType
     Public Property Status As Constants.EnvelopeStatus
     Public Property Uuid As String = Guid.NewGuid.ToString()
+
     Public Property Subject As String
     Public Property Message As String
+
     Public Property AddedWhen As Date
     Public Property User As New User()
 
diff --git a/EnvelopeGenerator.Common/Entities/EnvelopeReceiver.vb b/EnvelopeGenerator.Common/Entities/EnvelopeReceiver.vb
index a4d02a45..c4293343 100644
--- a/EnvelopeGenerator.Common/Entities/EnvelopeReceiver.vb
+++ b/EnvelopeGenerator.Common/Entities/EnvelopeReceiver.vb
@@ -15,7 +15,11 @@ Public Class EnvelopeReceiver
 
     Public ReadOnly Property Image As SvgBitmap
         Get
-            Return SvgBitmap.FromFile("Images/circle.svg")
+            Try
+                Return SvgBitmap.FromFile("Images/circle.svg")
+            Catch ex As Exception
+                Return Nothing
+            End Try
         End Get
     End Property
 
diff --git a/EnvelopeGenerator.Common/Models/EnvelopeModel.vb b/EnvelopeGenerator.Common/Models/EnvelopeModel.vb
index 63df340d..55823c1c 100644
--- a/EnvelopeGenerator.Common/Models/EnvelopeModel.vb
+++ b/EnvelopeGenerator.Common/Models/EnvelopeModel.vb
@@ -107,7 +107,7 @@ Public Class EnvelopeModel
             Dim oSql = "UPDATE [dbo].[TBSIG_ENVELOPE] SET STATUS = @STATUS, SENT_WHEN = GETDATE() WHERE GUID = @GUID"
             Dim oCommand As New SqlCommand(oSql)
             oCommand.Parameters.Add("GUID", SqlDbType.Int).Value = pEnvelope.Id
-            oCommand.Parameters.Add("STATUS", SqlDbType.NVarChar).Value = Constants.EnvelopeStatus.Sent
+            oCommand.Parameters.Add("STATUS", SqlDbType.Int).Value = Constants.EnvelopeStatus.Sent
 
             If Database.ExecuteNonQuery(oCommand) Then
                 Return True
diff --git a/EnvelopeGenerator.Form/frmMain.vb b/EnvelopeGenerator.Form/frmMain.vb
index 4a655cbb..b7edc668 100644
--- a/EnvelopeGenerator.Form/frmMain.vb
+++ b/EnvelopeGenerator.Form/frmMain.vb
@@ -114,10 +114,18 @@ Public Class frmMain
     End Sub
 
     Private Sub LoadEnvelope(pRowHandle As Integer)
-        Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(pRowHandle)
-        Dim oForm As New frmEnvelopeEditor() With {.State = State, .Envelope = oEnvelope}
-        oForm.ShowDialog()
-        GridEnvelopes.DataSource = Controller.ListEnvelopes()
+        Dim oHandle = SplashScreenManager.ShowOverlayForm(Me)
+        Try
+            Dim oEnvelope As Envelope = DirectCast(ViewEnvelopes.GetRow(pRowHandle), Envelope)
+            Dim oForm As New frmEnvelopeEditor() With {.State = State, .Envelope = oEnvelope}
+            oForm.ShowDialog()
+            GridEnvelopes.DataSource = Controller.ListEnvelopes()
+
+        Catch ex As Exception
+            Logger.Error(ex)
+        Finally
+            SplashScreenManager.CloseOverlayForm(oHandle)
+        End Try
     End Sub
 
     Private Sub DeleteEnvelope(pRowHandle As Integer)
diff --git a/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj b/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj
index fb5ba155..db9b9670 100644
--- a/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj
+++ b/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj
@@ -17,6 +17,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Reference Include="DevExpress.Data.v21.2">
+      <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Data.v21.2.dll</HintPath>
+    </Reference>
     <Reference Include="DigitalData.Modules.Base">
       <HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
     </Reference>