diff --git a/src/controllers/404.js b/src/controllers/404.js
index 0991d3cd86..33f04f142e 100644
--- a/src/controllers/404.js
+++ b/src/controllers/404.js
@@ -9,7 +9,7 @@ const plugins = require('../plugins');
 const middleware = require('../middleware');
 const helpers = require('../middleware/helpers');
 
-exports.handle404 = function handle404(req, res) {
+exports.handle404 = helpers.try(async (req, res) => {
 	const relativePath = nconf.get('relative_path');
 	const isClientScript = new RegExp(`^${relativePath}\\/assets\\/src\\/.+\\.js(\\?v=\\w+)?$`);
 
@@ -38,13 +38,13 @@ exports.handle404 = function handle404(req, res) {
 		}
 
 		meta.errors.log404(req.path.replace(/^\/api/, '') || '');
-		exports.send404(req, res);
+		await exports.send404(req, res);
 	} else {
 		res.status(404).type('txt').send('Not found');
 	}
-};
+});
 
-exports.send404 = async function (req, res) {
+exports.send404 = helpers.try(async (req, res) => {
 	res.status(404);
 	const path = String(req.path || '');
 	if (res.locals.isAPI) {
@@ -66,4 +66,4 @@ exports.send404 = async function (req, res) {
 		bodyClass: helpers.buildBodyClass(req, res),
 		icon: icons[Math.floor(Math.random() * icons.length)],
 	});
-};
+});
diff --git a/src/middleware/header.js b/src/middleware/header.js
index e1db4535e3..b6c4e47ec0 100644
--- a/src/middleware/header.js
+++ b/src/middleware/header.js
@@ -1,7 +1,5 @@
 'use strict';
 
-const util = require('util');
-
 const user = require('../user');
 const plugins = require('../plugins');
 const helpers = require('./helpers');
@@ -13,6 +11,15 @@ const controllers = {
 const middleware = module.exports;
 
 middleware.buildHeader = helpers.try(async (req, res, next) => {
+	await doBuildHeader(req, res);
+	next();
+});
+
+middleware.buildHeaderAsync = async (req, res) => {
+	await doBuildHeader(req, res);
+};
+
+async function doBuildHeader(req, res) {
 	res.locals.renderHeader = true;
 	res.locals.isAPI = false;
 	if (req.method === 'GET') {
@@ -33,7 +40,4 @@ middleware.buildHeader = helpers.try(async (req, res, next) => {
 	}
 
 	res.locals.config = config;
-	next();
-});
-
-middleware.buildHeaderAsync = util.promisify(middleware.buildHeader);
+}