diff --git a/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java b/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java
index 15bb9086d5..f767622b21 100644
--- a/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java
+++ b/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java
@@ -488,8 +488,11 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
             else 
             {
                     for (MimeMessageHelper message : finalMessages) {
+                    if (message != null)
+                    {
                         sendEmail(ruleAction, message);
                     }
+                    }
             }
         }
 
@@ -933,6 +936,7 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
             {
                 logger.warn("Unable to prepare mail message. Skipping.", e);
             }
+            return null;
         }
         
         return messageRef[0];