diff --git a/src/middleware/index.js b/src/middleware/index.js
index 0a97cdfbaf..51882b8b7d 100644
--- a/src/middleware/index.js
+++ b/src/middleware/index.js
@@ -144,7 +144,7 @@ function handleErrors(err, req, res, next) {
 
 function catch404(req, res, next) {
 	var	isLanguage = new RegExp('^' + nconf.get('relative_path') + '/language/[\\w]{2,}/.*.json'),
-		isClientScript = new RegExp('^' + nconf.get('relative_path') + '\\/src\\/forum(\\/admin)?\\/[\\w]+\\.js');
+		isClientScript = new RegExp('^' + nconf.get('relative_path') + '\\/src\\/forum(\\/admin)?\\/.+\\.js');
 
 	res.status(404);
 
diff --git a/src/routes/authentication.js b/src/routes/authentication.js
index ad85141c75..60e54c0c57 100644
--- a/src/routes/authentication.js
+++ b/src/routes/authentication.js
@@ -138,6 +138,9 @@
 				app.post('/login', function(req, res, next) {
 					if (req.body.username && utils.isEmailValid(req.body.username)) {
 						user.getUsernameByEmail(req.body.username, function(err, username) {
+							if (err) {
+								return next(err);
+							}
 							req.body.username = username ? username : req.body.username;
 							login(req, res, next);
 						});
diff --git a/src/user.js b/src/user.js
index 6d72f43020..6abb142547 100644
--- a/src/user.js
+++ b/src/user.js
@@ -414,6 +414,9 @@ var bcrypt = require('bcryptjs'),
 
 	User.getUsernameByEmail = function(email, callback) {
 		db.getObjectField('email:uid', email, function(err, uid) {
+			if (err) {
+				return callback(err);
+			}
 			User.getUserField(uid, 'username', callback);
 		});
 	};