06-12-23

EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb

@@ -85,7 +85,10 @@ Public Class EnvelopeEditorController
     Public Function SaveReceivers(pEnvelope As Envelope, pReceiversFromGrid As List(Of EnvelopeReceiver)) As Boolean
         Dim oExistingReceivers As List(Of EnvelopeReceiver) = ReceiverModel.ListReceivers(pReceiversFromGrid).ToList()
         Dim oExistingAddresses = oExistingReceivers.Select(Function(r) r.Email)
-        Dim oNewReceivers = pReceiversFromGrid.Where(Function(r) Not oExistingAddresses.Contains(r.Email)).ToList()
+        Dim oNewReceivers = pReceiversFromGrid.Where(Function(r)
+                                                         If r.Email Is Nothing Then Return False
+                                                         Return Not oExistingAddresses.Contains(r.Email)
+                                                     End Function).ToList()
 
         If CreateNewReceivers(oNewReceivers) = False Then
             Return False
@@ -96,6 +99,9 @@ Public Class EnvelopeEditorController
         pEnvelope.Receivers.Clear()
 
         For Each oReceiver In pReceiversFromGrid
+            If oReceiver.Email Is Nothing Then Continue For
+            If oReceiver.Name Is Nothing Then Continue For
+
             Dim oDbReceiver = oAllReceivers.Where(Function(r) r.Email = oReceiver.Email).SingleOrDefault()
             If oDbReceiver IsNot Nothing Then
                 oReceiver.Id = oDbReceiver.Id