diff --git a/src/database/mongo/sets.js b/src/database/mongo/sets.js
index 210c3ad2fe..208e380a12 100644
--- a/src/database/mongo/sets.js
+++ b/src/database/mongo/sets.js
@@ -24,7 +24,7 @@ module.exports = function(db, module) {
 		}, {
 			upsert: true,
 			w: 1
-		}, function(err) {
+		}, function(err, res) {
 			callback(err);
 		});
 	};
@@ -54,7 +54,7 @@ module.exports = function(db, module) {
 			}});
 		}
 
-		bulk.execute(function(err) {
+		bulk.execute(function(err, res) {
 			callback(err);
 		});
 	};
@@ -69,7 +69,9 @@ module.exports = function(db, module) {
 			array[index] = helpers.valueToString(element);
 		});
 
-		db.collection('objects').update({_key: key}, {$pullAll: {members: value}}, callback);
+		db.collection('objects').update({_key: key}, {$pullAll: {members: value}}, function(err, res) {
+			callback(err);
+		});
 	};
 
 	module.setsRemove = function(keys, value, callback) {
diff --git a/src/database/redis/sets.js b/src/database/redis/sets.js
index 9148dd34f8..53ac5b0d07 100644
--- a/src/database/redis/sets.js
+++ b/src/database/redis/sets.js
@@ -3,7 +3,7 @@
 module.exports = function(redisClient, module) {
 	module.setAdd = function(key, value, callback) {
 		callback = callback || function() {};
-		redisClient.sadd(key, value, function(err) {
+		redisClient.sadd(key, value, function(err, res) {
 			callback(err);
 		});
 	};
@@ -14,13 +14,15 @@ module.exports = function(redisClient, module) {
 		for (var i=0; i<keys.length; ++i) {
 			multi.sadd(keys[i], value);
 		}
-		multi.exec(function(err) {
+		multi.exec(function(err, res) {
 			callback(err);
 		});
 	};
 
 	module.setRemove = function(key, value, callback) {
-		redisClient.srem(key, value, callback);
+		redisClient.srem(key, value, function(err, res) {
+			callback(err);
+		});
 	};
 
 	module.setsRemove = function(keys, value, callback) {
diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js
index 6db4f4b762..00f7988656 100644
--- a/src/socket.io/posts.js
+++ b/src/socket.io/posts.js
@@ -68,36 +68,28 @@ SocketPosts.reply = function(socket, data, callback) {
 };
 
 SocketPosts.upvote = function(socket, data, callback) {
-	if (!data || !data.pid) {
-		return callback(new Error('[[error:invalid-data]]'));
-	}
-	favouriteCommand('upvote', 'voted', socket, data, callback);
-	SocketPosts.sendNotificationToPostOwner(data.pid, socket.uid, 'notifications:upvoted_your_post_in');
+	favouriteCommand(socket, 'upvote', 'voted', 'notifications:upvoted_your_post_in', data, callback);
 };
 
 SocketPosts.downvote = function(socket, data, callback) {
-	favouriteCommand('downvote', 'voted', socket, data, callback);
+	favouriteCommand(socket, 'downvote', 'voted', '', data, callback);
 };
 
 SocketPosts.unvote = function(socket, data, callback) {
-	favouriteCommand('unvote', 'voted', socket, data, callback);
+	favouriteCommand(socket, 'unvote', 'voted', '', data, callback);
 };
 
 SocketPosts.favourite = function(socket, data, callback) {
-	if (!data || !data.pid) {
-		return callback(new Error('[[error:invalid-data]]'));
-	}
-	favouriteCommand('favourite', 'favourited', socket, data, callback);
-	SocketPosts.sendNotificationToPostOwner(data.pid, socket.uid, 'notifications:favourited_your_post_in');
+	favouriteCommand(socket, 'favourite', 'favourited', 'notifications:favourited_your_post_in', data, callback);
 };
 
 SocketPosts.unfavourite = function(socket, data, callback) {
-	favouriteCommand('unfavourite', 'favourited', socket, data, callback);
+	favouriteCommand(socket, 'unfavourite', 'favourited', '', data, callback);
 };
 
-function favouriteCommand(command, eventName, socket, data, callback) {
+function favouriteCommand(socket, command, eventName, notification, data, callback) {
 	if(!data || !data.pid || !data.room_id) {
-		return;
+		return callback(new Error('[[error:invalid-data]]'));
 	}
 	async.parallel({
 		exists: function(next) {
@@ -108,7 +100,7 @@ function favouriteCommand(command, eventName, socket, data, callback) {
 		}
 	}, function(err, results) {
 		if (err || !results.exists) {
-			return callback(err);
+			return callback(err || new Error('[[error:invalid-pid]]'));
 		}
 
 		if (parseInt(results.deleted, 10) === 1) {
@@ -122,16 +114,20 @@ function favouriteCommand(command, eventName, socket, data, callback) {
 
 			socket.emit('posts.' + command, result);
 
-			if(data.room_id && result && eventName) {
+			if (result && eventName) {
 				websockets.in(data.room_id).emit('event:' + eventName, result);
 			}
+
+			if (notification) {
+				SocketPosts.sendNotificationToPostOwner(data.pid, socket.uid, notification);
+			}
 			callback();
 		});
 	});
 }
 
 SocketPosts.sendNotificationToPostOwner = function(pid, fromuid, notification) {
-	if(!pid || !fromuid) {
+	if(!pid || !fromuid || !notification) {
 		return;
 	}
 	posts.getPostFields(pid, ['tid', 'uid', 'content'], function(err, postData) {