diff --git a/digicert-certcentral-caplugin/CertCentralCAPlugin.cs b/digicert-certcentral-caplugin/CertCentralCAPlugin.cs
index 176c2bd..9e6a414 100644
--- a/digicert-certcentral-caplugin/CertCentralCAPlugin.cs
+++ b/digicert-certcentral-caplugin/CertCentralCAPlugin.cs
@@ -873,7 +873,7 @@ public async Task Synchronize(BlockingCollection<AnyCAPluginCertificate> blockin
 			_logger.LogTrace($"Sync CAs: {syncCAstring}");
 			List<string> caList = _config.SyncCAs;
 
-			caList.ForEach(c => c.ToUpper());
+			caList = caList.Select(c => c?.Trim().ToUpper()).Where(c => !string.IsNullOrEmpty(c)).ToList();
 
 			List<string> divFilters = new List<string>();
 			if (!string.IsNullOrEmpty(_config.SyncDivisionFilter))
@@ -1699,6 +1699,7 @@ private List<AnyCAPluginCertificate> GetAllConnectorCertsForOrder(string caReque
 			if (productIds != null && productIds.Count > 0 && !productIds.Contains(orderResponse.product.name_id.ToString()))
 			{
 				_logger.LogTrace($"Found order ID {orderId} that does not match Product filter. Product ID: {orderResponse.product.name_id.ToString()} Skipping...");
+				return null;
 			}
 
 			var orderCerts = GetAllCertsForOrder(orderId);