diff --git a/src/messaging.js b/src/messaging.js
index 7267e16a9e..c9cf356c7b 100644
--- a/src/messaging.js
+++ b/src/messaging.js
@@ -220,6 +220,9 @@ Messaging.getTeaser = function (uid, roomId, callback) {
 			Messaging.getMessageFields(mids[0], ['fromuid', 'content', 'timestamp'], next);
 		},
 		function (teaser, next) {
+			if (!teaser) {
+				return callback();
+			}
 			user.blocks.is(teaser.fromuid, uid, function (err, blocked) {
 				if (err || blocked) {
 					return callback(err);
diff --git a/src/middleware/user.js b/src/middleware/user.js
index 247424b891..0c726c4403 100644
--- a/src/middleware/user.js
+++ b/src/middleware/user.js
@@ -221,17 +221,6 @@ module.exports = function (middleware) {
 		}
 	};
 
-	middleware.exposeUid = function (req, res, next) {
-		if (!req.params.userslug) {
-			return next();
-		}
-
-		user.getUidByUserslug(req.params.userslug, function (err, uid) {
-			res.locals.uid = uid;
-			next(err, uid);
-		});
-	};
-
 	middleware.handleBlocking = function (req, res, next) {
 		user.blocks.is(res.locals.uid, req.uid, function (err, blocked) {
 			if (err) {
diff --git a/src/user/blocks.js b/src/user/blocks.js
index 1d3720c20e..44bfbac3ce 100644
--- a/src/user/blocks.js
+++ b/src/user/blocks.js
@@ -76,7 +76,7 @@ module.exports = function (User) {
 			property = 'uid';
 		}
 
-		if (!Array.isArray(set) || !(set[0].hasOwnProperty(property) || typeof set[0] === 'number' || typeof set[0] === 'string')) {
+		if (!Array.isArray(set) || !set.length || !(set[0].hasOwnProperty(property) || typeof set[0] === 'number' || typeof set[0] === 'string')) {
 			return callback(null, set);
 		}
 
diff --git a/test/user.js b/test/user.js
index 5701787071..021007c315 100644
--- a/test/user.js
+++ b/test/user.js
@@ -1783,7 +1783,7 @@ describe('User', function () {
 			it('should automatically increment corresponding user field', function (done) {
 				db.getObjectField('user:1', 'blocksCount', function (err, count) {
 					assert.ifError(err);
-					assert.strictEqual(count, '1');
+					assert.strictEqual(parseInt(count, 10), 1);
 					done();
 				});
 			});
@@ -1809,7 +1809,7 @@ describe('User', function () {
 			it('should automatically decrement corresponding user field', function (done) {
 				db.getObjectField('user:1', 'blocksCount', function (err, count) {
 					assert.ifError(err);
-					assert.strictEqual(count, '0');
+					assert.strictEqual(parseInt(count, 10), 0);
 					done();
 				});
 			});