From 01cb67d1f3bd45a4b46c8387079bacc1f4c4ac1e Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Wed, 5 Feb 2014 18:25:13 -0500
Subject: [PATCH] closes #945

---
 src/emailer.js | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/emailer.js b/src/emailer.js
index 18c48256cc..aa9c24e350 100644
--- a/src/emailer.js
+++ b/src/emailer.js
@@ -32,18 +32,23 @@ Emailer.send = function(template, uid, params) {
 		}
 	}, function(err, results) {
 		User.getUserField(uid, 'email', function(err, email) {
-			if (!err) {
-				Plugins.fireHook('action:email.send', {
-					to: email,
-					from: Meta.config['email:from'] || 'no-reply@localhost.lan',
-					subject: params.subject,
-					html: results.html,
-					plaintext: results.plaintext,
-
-					template: template,
-					uid: uid
-				});
+			if(err) {
+				return winston.error(err.message);
 			}
+
+			if(!email) {
+				return winston.warn('uid : ' + uid + ' has no email, not sending.');
+			}
+
+			Plugins.fireHook('action:email.send', {
+				to: email,
+				from: Meta.config['email:from'] || 'no-reply@localhost.lan',
+				subject: params.subject,
+				html: results.html,
+				plaintext: results.plaintext,
+				template: template,
+				uid: uid
+			});
 		});
 	});
 };