diff --git a/public/logo.png b/public/logo.png
index 6a6c184126..d8dcba4638 100644
Binary files a/public/logo.png and b/public/logo.png differ
diff --git a/src/controllers/admin/themes.js b/src/controllers/admin/themes.js
index 4f6f3e1f3b..97e7a58d6e 100644
--- a/src/controllers/admin/themes.js
+++ b/src/controllers/admin/themes.js
@@ -7,9 +7,9 @@ var themesController = {};
 
 themesController.get = function (req, res, next) {
 	var themeDir = path.join(__dirname, '../../../node_modules/' + req.params.theme);
-	file.exists(themeDir, function (exists) {
-		if (!exists) {
-			return next();
+	file.exists(themeDir, function (err, exists) {
+		if (err || !exists) {
+			return next(err);
 		}
 
 		var themeConfig = require(path.join(themeDir, 'theme.json')),
diff --git a/src/plugins.js b/src/plugins.js
index 52378e7f38..00a932a337 100644
--- a/src/plugins.js
+++ b/src/plugins.js
@@ -352,9 +352,7 @@ var middleware;
 						}
 						callback(null, stats.isDirectory());
 					});
-				}, function (plugins) {
-					next(null, plugins);
-				});
+				}, next);
 			},
 
 			function (files, next) {
diff --git a/src/plugins/load.js b/src/plugins/load.js
index 98a470f914..0ccc095b7c 100644
--- a/src/plugins/load.js
+++ b/src/plugins/load.js
@@ -160,13 +160,13 @@ module.exports = function (Plugins) {
 				var realPath = pluginData.staticDirs[mappedPath];
 				var staticDir = path.join(pluginPath, realPath);
 
-				file.exists(staticDir, function (exists) {
+				file.exists(staticDir, function (err, exists) {
 					if (exists) {
 						Plugins.staticDirs[pluginData.id + '/' + mappedPath] = staticDir;
 					} else {
 						winston.warn('[plugins/' + pluginData.id + '] Mapped path \'' + mappedPath + ' => ' + staticDir + '\' not found.');
 					}
-					callback();
+					callback(err);
 				});
 			}
 		}
diff --git a/src/webserver.js b/src/webserver.js
index fec42974c6..43e3c4b324 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -262,11 +262,11 @@ module.exports.testSocket = function (socketPath, callback) {
 	var file = require('./file');
 	async.series([
 		function (next) {
-			file.exists(socketPath, function (exists) {
+			file.exists(socketPath, function (err, exists) {
 				if (exists) {
 					next();
 				} else {
-					callback();
+					callback(err);
 				}
 			});
 		},