From 33255d73dd682066554eff3096c46cb6bef39513 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Wed, 20 Apr 2016 10:53:47 -0400
Subject: [PATCH] fix #4546

---
 public/language/en_GB/error.json | 1 +
 src/emailer.js                   | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/public/language/en_GB/error.json b/public/language/en_GB/error.json
index 65e2c584df..a77cf6cb06 100644
--- a/public/language/en_GB/error.json
+++ b/public/language/en_GB/error.json
@@ -27,6 +27,7 @@
 	"no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
 	"email-confirm-failed": "We could not confirm your email, please try again later.",
 	"confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",
+	"sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
 
 	"username-too-short": "Username too short",
 	"username-too-long": "Username too long",
diff --git a/src/emailer.js b/src/emailer.js
index 34b5250908..e297985572 100644
--- a/src/emailer.js
+++ b/src/emailer.js
@@ -113,7 +113,11 @@ var fallbackTransport;
 				}
 			}
 		], function (err) {
-			callback(err);
+			if (err && err.code === 'ENOENT') {
+				callback(new Error('[[error:sendmail-not-found]]'));
+			} else {
+				callback(err);
+			}
 		});
 	};