From ad6b11ee69dea791097a03897280ae93649f5f33 Mon Sep 17 00:00:00 2001
From: Andreea Nechifor <Andreea.Nechifor@ness.com>
Date: Fri, 15 Sep 2017 15:24:31 +0300
Subject: [PATCH] REPO-2868 : MNT-17970

---
 .../alfresco/repo/action/executer/MailActionExecuter.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/alfresco/repo/action/executer/MailActionExecuter.java b/src/main/java/org/alfresco/repo/action/executer/MailActionExecuter.java
index c7a1168f7b..1cfff8df39 100644
--- a/src/main/java/org/alfresco/repo/action/executer/MailActionExecuter.java
+++ b/src/main/java/org/alfresco/repo/action/executer/MailActionExecuter.java
@@ -1047,8 +1047,8 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
         {
             // Send the message unless we are in "testMode"
             if (!testMode)
-            {
-                mailService.send(preparedMessage.getMimeMessage());
+            {	
+            	mailService.send(preparedMessage.getMimeMessage());
                 onSend();
             }
             else
@@ -1057,7 +1057,7 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
                 testSentCount++;
             }
         }
-        catch (MailException e)
+        catch (NullPointerException | MailException e)
         {
             onFail();
             String to = (String)ruleAction.getParameterValue(PARAM_TO);