From ded8de905d4cce7824f6c60917567a4a22a0151c Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Fri, 17 Oct 2014 19:37:09 -0400
Subject: [PATCH] closes #2278

---
 src/middleware/index.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/middleware/index.js b/src/middleware/index.js
index e1b7c0c218..3758c0a712 100644
--- a/src/middleware/index.js
+++ b/src/middleware/index.js
@@ -46,6 +46,13 @@ function routeCurrentTheme(app, themeId, themesData) {
 	meta.themes.setPath(themeObj);
 }
 
+function setupFavicon() {
+	var faviconPath = path.join(__dirname, '../../', 'public', meta.config['brand:favicon'] ? meta.config['brand:favicon'] : 'favicon.ico');
+	if (fs.existsSync(faviconPath)) {
+		app.use(favicon(faviconPath));	
+	}
+}
+
 module.exports = function(app, data) {
 	middleware = require('./middleware')(app);
 
@@ -62,7 +69,8 @@ module.exports = function(app, data) {
 
 	app.use(compression());
 
-	app.use(favicon(path.join(__dirname, '../../', 'public', meta.config['brand:favicon'] ? meta.config['brand:favicon'] : 'favicon.ico')));
+	setupFavicon();
+	
 	app.use(relativePath + '/apple-touch-icon', middleware.routeTouchIcon);
 
 	app.use(bodyParser.urlencoded({extended: true}));