From 4570edb122cf35559a0e35b13888439282a72b7a Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Mon, 2 Jun 2014 12:44:37 -0400
Subject: [PATCH] closes #1623

---
 src/notifications.js | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/notifications.js b/src/notifications.js
index 1df466629f..8d9b6b361e 100644
--- a/src/notifications.js
+++ b/src/notifications.js
@@ -205,22 +205,24 @@ var async = require('async'),
 	}
 
 	Notifications.mark_read = function(nid, uid, callback) {
-		if (parseInt(uid, 10) > 0) {
-			Notifications.get(nid, uid, function(notif_data) {
-				async.parallel([
-					function(next) {
-						db.sortedSetRemove('uid:' + uid + ':notifications:unread', nid, next);
-					},
-					function(next) {
-						db.sortedSetAdd('uid:' + uid + ':notifications:read', notif_data.datetime, nid, next);
-					}
-				], function(err) {
-					if (callback) {
-						callback();
-					}
-				});
-			});
+		callback = callback || function() {};
+		if (!parseInt(uid, 10)) {
+			return callback();
 		}
+
+		Notifications.get(nid, uid, function(notif_data) {
+			async.parallel([
+				function(next) {
+					db.sortedSetRemove('uid:' + uid + ':notifications:unread', nid, next);
+				},
+				function(next) {
+					if (!notif_data) {
+						return next();
+					}
+					db.sortedSetAdd('uid:' + uid + ':notifications:read', notif_data.datetime, nid, next);
+				}
+			], callback);
+		});
 	};
 
 	Notifications.mark_read_multiple = function(nids, uid, callback) {