diff --git a/modules/client_serverlist/addserver.lua b/modules/client_serverlist/addserver.lua
index 3a4f65d3..e85bc172 100644
--- a/modules/client_serverlist/addserver.lua
+++ b/modules/client_serverlist/addserver.lua
@@ -19,7 +19,7 @@ function AddServer.add()
 
   local added, error = ServerList.add(host, port, protocol)
   if not added then
-    displayErrorBox(tr('Add Error'), tr(error))
+    displayErrorBox(tr('Error'), tr(error))
   else
     AddServer.hide()
   end
diff --git a/modules/client_serverlist/serverlist.lua b/modules/client_serverlist/serverlist.lua
index 2f084548..4f7bd37a 100644
--- a/modules/client_serverlist/serverlist.lua
+++ b/modules/client_serverlist/serverlist.lua
@@ -11,8 +11,10 @@ function ServerList.init()
   serverListWindow = g_ui.displayUI('serverlist')
   serverTextList = serverListWindow:getChildById('serverList')
 
-  servers = g_settings.getNode('ServerList') or {}
-  ServerList.load()
+  local serverSettings = g_settings.getNode('ServerList')
+  if serverSettings then
+    ServerList.load(serverSettings)
+  end
 end
 
 function ServerList.terminate()
@@ -23,9 +25,9 @@ function ServerList.terminate()
   ServerList = nil
 end
 
-function ServerList.load()
-  for k,server in pairs(servers) do
-    ServerList.add(k, server.port, server.protocol, true)
+function ServerList.load(serverSettings)
+  for host, server in pairs(serverSettings) do
+    ServerList.add(host, server.port, server.protocol, true)
   end
 end
 
@@ -43,7 +45,9 @@ function ServerList.select()
 end
 
 function ServerList.add(host, port, protocol, load)
-  if not load and servers[host] then
+  if not host or not port or not protocol then
+    return false, 'Failed to load settings'
+  elseif not load and servers[host] then
     return false, 'Server already exists'
   elseif host == '' or port == '' then
     return false, 'Required fields are missing'