diff --git a/src/main/java/com/kms/service/EmailService.java b/src/main/java/com/kms/service/EmailService.java
index 82efdebf817965634db8a5ec217c36b50d9d3cab..fe52d5921e61d958fba6c6f36b4cf9350026033e 100644
--- a/src/main/java/com/kms/service/EmailService.java
+++ b/src/main/java/com/kms/service/EmailService.java
@@ -10,6 +10,7 @@ import javax.mail.Session;
 import javax.mail.Transport;
 import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMessage;
+import java.util.Optional;
 import java.util.Properties;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -62,12 +63,18 @@ public class EmailService {
             if (toCount == 0)
                 return;
 
-            for (String email: cc.split(",")) {
-                email = email.trim();
-                if (!EmailUtil.isEmailValid(email))
-                    continue;
-                message.addRecipient(Message.RecipientType.CC, new InternetAddress(email));
-            }
+            Optional.ofNullable(cc).ifPresent(el -> {
+                for (String email: el.split(",")) {
+                    email = email.trim();
+                    if (!EmailUtil.isEmailValid(email))
+                        continue;
+                    try {
+                        message.addRecipient(Message.RecipientType.CC, new InternetAddress(email));
+                    } catch (MessagingException e) {
+                        System.out.println("Error while sending email: " + e.getMessage());
+                    }
+                }
+            });
             message.setSubject(subject);
             message.setContent(body, "text/html");