diff --git a/lib/tasks/demo.js b/lib/tasks/demo.js
index 2e5790de..4d9de6ec 100644
--- a/lib/tasks/demo.js
+++ b/lib/tasks/demo.js
@@ -308,11 +308,16 @@ module.exports.runServer = function(gulp, config) {
 				reject(err);
 				return;
 			}
+
 			if (server) {
 				resolve(server);
 				return;
 			}
+
+			config = config || {};
+
 			log.primary('Open http://localhost:'+port+'/demos/local/ in a browser to view the demos');
+
 			server = gulp.src('.')
 				.pipe(webserver({
 					directoryListing: true,