diff --git a/src/controllers/api.js b/src/controllers/api.js
index d3aef0b3fe..d136bb5e84 100644
--- a/src/controllers/api.js
+++ b/src/controllers/api.js
@@ -50,6 +50,10 @@ apiController.getConfig = function(req, res, next) {
 	}
 
 	user.getSettings(req.user.uid, function(err, settings) {
+		if (err) {
+			return next(err);
+		}
+
 		config.usePagination = settings.usePagination;
 		config.topicsPerPage = settings.topicsPerPage;
 		config.postsPerPage = settings.postsPerPage;
diff --git a/src/emailer.js b/src/emailer.js
index 402bce31cd..1e008c8a24 100644
--- a/src/emailer.js
+++ b/src/emailer.js
@@ -8,7 +8,6 @@ var	fs = require('fs'),
 	User = require('./user'),
 	Plugins = require('./plugins'),
 	Meta = require('./meta'),
-	Translator = require('../public/src/translator'),
 	templates = require('../public/src/templates'),
 
 	app = {},
diff --git a/src/favourites.js b/src/favourites.js
index 30ef254cfb..11465ff6a5 100644
--- a/src/favourites.js
+++ b/src/favourites.js
@@ -2,8 +2,7 @@ var async = require('async'),
 
 	db = require('./database'),
 	posts = require('./posts'),
-	user = require('./user'),
-	translator = require('./../public/src/translator');
+	user = require('./user');
 
 (function (Favourites) {
 	"use strict";
diff --git a/src/middleware/index.js b/src/middleware/index.js
index 693f17b1c1..530dab5635 100644
--- a/src/middleware/index.js
+++ b/src/middleware/index.js
@@ -1,7 +1,6 @@
 "use strict";
 
 var templates = require('./../../public/src/templates'),
-	translator = require('./../../public/src/translator'),
 	utils = require('./../../public/src/utils'),
 	meta = require('./../meta'),
 	plugins = require('./../plugins'),