diff --git a/TODO b/TODO
index 8dbceea1..6ba04c80 100644
--- a/TODO
+++ b/TODO
@@ -1,15 +1,13 @@
 ### Notable missing features
-* mount and stop button
+* stop button
 * character profile
 * food time, speed, total capacity, base skills
 * spell list
 * spell bar
 * split chat
-* market
 * spell delays
 * offline training
 * purse bag
-* mounts drawings
 * report name/statements/bot/macros
 * ignore list
 * light
diff --git a/modules/game_console/console.lua b/modules/game_console/console.lua
index c22d72c0..b1555a12 100644
--- a/modules/game_console/console.lua
+++ b/modules/game_console/console.lua
@@ -562,13 +562,15 @@ end
 function onGameStart()
   -- open last channels
   local lastChannelsOpen = g_settings.getNode('lastChannelsOpen')
-  local savedChannels = lastChannelsOpen[g_game.getLocalPlayer():getName()]
-  if savedChannels then
-    for channelName, channelId in pairs(savedChannels) do
-      channelId = tonumber(channelId)
-      if channelId ~= 0 then
-        if not table.find(channels, channelId) then
-          g_game.joinChannel(channelId)
+  if lastChannelsOpen then
+    local savedChannels = lastChannelsOpen[g_game.getLocalPlayer():getName()]
+    if savedChannels then
+      for channelName, channelId in pairs(savedChannels) do
+        channelId = tonumber(channelId)
+        if channelId ~= 0 then
+          if not table.find(channels, channelId) then
+            g_game.joinChannel(channelId)
+          end
         end
       end
     end