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);
 		}