From 78f6915577ac354be296616cd15e12740abe4846 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 27 Sep 2015 19:33:25 -0600
Subject: [PATCH] * More minor WIP on making theme merging more flexible

---
 core/view_controller.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/view_controller.js b/core/view_controller.js
index 4fb6b851..2c9e5bc2 100644
--- a/core/view_controller.js
+++ b/core/view_controller.js
@@ -210,7 +210,7 @@ function ViewController(options) {
 		var submitId;
 		var initialFocusId = 1;
 
-		async.each(Object.keys(config.mci), function entry(mci, nextItem) {
+		async.each(Object.keys(config.mci || {}), function entry(mci, nextItem) {
 			var mciMatch = mci.match(MCI_REGEXP);	//	:TODO: How to handle auto-generated IDs????
 			if(null === mciMatch) {
 				self.client.log.warn( { mci : mci }, 'Unable to parse MCI code');
@@ -572,15 +572,16 @@ ViewController.prototype.loadFromMenuConfig = function(options, cb) {
 			},
 			function applyThemeCustomization(callback) {
 				//if(_.isObject(formConfig)) {
+					formConfig = formConfig || {}
+
 					menuUtil.applyThemeCustomization({
 						name		: self.client.currentMenuModule.menuName,
 						type		: 'menus',
 						client		: self.client,
-						configMci	: formConfig ? formConfig.mci : {},
+						configMci	: formConfig.mci,
 						formId		: formIdKey,
 					});
 				//}
-
 				callback(null);
 			},
 			function applyViewConfiguration(callback) {