diff --git a/src/Correo.MailKit/Extensions/ModelExtensions.cs b/src/Correo.MailKit/Extensions/ModelExtensions.cs
index ace04ae..054d617 100644
--- a/src/Correo.MailKit/Extensions/ModelExtensions.cs
+++ b/src/Correo.MailKit/Extensions/ModelExtensions.cs
@@ -11,6 +11,9 @@ namespace Correo.MailKit.Extensions
 
         private static void AddRange(this InternetAddressList list, IEnumerable<EmailMessage.MailAddress> addresses)
         {
+            if (addresses == null)
+                return;
+
             foreach (var item in addresses)
                 list.Add(item.ToMailboxAddress());
         }
diff --git a/src/Correo.SmtpClient/Extensions/ModelExtensions.cs b/src/Correo.SmtpClient/Extensions/ModelExtensions.cs
index a9b43c6..1f8ba47 100644
--- a/src/Correo.SmtpClient/Extensions/ModelExtensions.cs
+++ b/src/Correo.SmtpClient/Extensions/ModelExtensions.cs
@@ -11,6 +11,9 @@ namespace Correo.SmtpClient.Extensions
 
         private static void AddRange(this MailAddressCollection collection, IEnumerable<EmailMessage.MailAddress> addresses)
         {
+            if (addresses == null)
+                return;
+
             foreach (var item in addresses)
                 collection.Add(item.ToMailAddress());
         }