From a06f721185f70057f7ddf4558e2d3f193259ec76 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 16 Jun 2016 22:35:27 -0600
Subject: [PATCH] prevMenu() if MenuModule load error

---
 core/menu_module.js | 1 +
 mods/msg_list.js    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/menu_module.js b/core/menu_module.js
index 503829c1..e454ff58 100644
--- a/core/menu_module.js
+++ b/core/menu_module.js
@@ -132,6 +132,7 @@ function MenuModule(options) {
 				if(err) {
 					console.log(err)
 					//	:TODO: what to do exactly?????
+					return self.prevMenu();
 				}
 
 				self.finishedLoading();
diff --git a/mods/msg_list.js b/mods/msg_list.js
index fbffa162..c0b421a6 100644
--- a/mods/msg_list.js
+++ b/mods/msg_list.js
@@ -133,7 +133,7 @@ MessageListModule.prototype.mciReady = function(mciData, cb) {
 					callback(0 === self.messageList.length ? new Error('No messages in area') : null);
 				} else {
 					messageArea.getMessageListForArea( { client : self.client }, self.messageAreaTag, function msgs(err, msgList) {
-						if(msgList && 0 === msgList.length) {
+						if(!msgList || 0 === msgList.length) {
 							callback(new Error('No messages in area'));
 						} else {
 							self.messageList = msgList;
@@ -210,6 +210,7 @@ MessageListModule.prototype.mciReady = function(mciData, cb) {
 		function complete(err) {
 			if(err) {
 				self.client.log.error( { error : err.toString() }, 'Error loading message list');
+				
 			}
 			cb(err);
 		}