Merge branch 'master' into develop

src/controllers/accounts/follow.js

@@ -14,8 +14,11 @@ followController.getFollowers = async function (req, res, next) {
 	await getFollow('account/followers', 'followers', req, res, next);
 };
 
-async function getFollow(tpl, name, req, res) {
+async function getFollow(tpl, name, req, res, next) {
 	const { userData: payload } = res.locals;
+	if (!payload) {
+		return next();
+	}
 	const {
 		username, userslug, followerCount, followingCount,
 	} = payload;

src/middleware/user.js

@@ -260,6 +260,9 @@ module.exports = function (middleware) {
 		}
 
 		res.locals.userData = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid, req.query);
+		if (!res.locals.userData) {
+			return next('route');
+		}
 		next();
 	};