diff --git a/BedBrigade.Data/Services/EmailQueueDataService.cs b/BedBrigade.Data/Services/EmailQueueDataService.cs
index 124b3408..9e878105 100644
--- a/BedBrigade.Data/Services/EmailQueueDataService.cs
+++ b/BedBrigade.Data/Services/EmailQueueDataService.cs
@@ -377,6 +377,11 @@ public async Task<ServiceResponse<bool>> DeleteQueuedBySignUpId(int signUpId)
 
         public async Task<ServiceResponse<string>> QueueEmail(EmailQueue email)
         {
+            if (string.IsNullOrWhiteSpace(email.ToAddress))
+            {
+                return new ServiceResponse<string>("Blank email, skipping", true);
+            }
+
             var duplicate = await GetDuplicateEmails(email);
 
             if (duplicate != null)
diff --git a/BedBrigade.Data/Services/SmsQueueDataService.cs b/BedBrigade.Data/Services/SmsQueueDataService.cs
index 2fd6eb6d..c6a6c7d7 100644
--- a/BedBrigade.Data/Services/SmsQueueDataService.cs
+++ b/BedBrigade.Data/Services/SmsQueueDataService.cs
@@ -563,6 +563,11 @@ public async Task<ServiceResponse<string>> QueueBulkSms(int locationId, List<str
     //This is currently only used by QueueDeliverySmsReminder and QueueSignUpSmsReminder
     public async Task<ServiceResponse<string>> QueueSms(SmsQueue smsQueue)
     {
+        if (string.IsNullOrWhiteSpace(StringUtil.ExtractDigits(smsQueue.ToPhoneNumber)))
+        {
+            return new ServiceResponse<string>("Blank phone number, skipping", true);
+        }
+
         var duplicate = await GetDuplicateSms(smsQueue);
 
         if (duplicate != null)