diff --git a/leaderboard.lua b/leaderboard.lua
index 13d1b1a..6cae1f3 100644
--- a/leaderboard.lua
+++ b/leaderboard.lua
@@ -121,7 +121,7 @@ local function getScoreTable(map, flags)
 	--return id
 
 	local mode = flags & F_SPBATK
-	return lb[mode] and lb[mode][map] or {}
+	return lb[mode] and lb[mode][map] or nil
 end
 
 local function score_t(map, name, skin, color, time, splits, flags, restat)
@@ -171,7 +171,7 @@ if f then
 			flags = tonumber(t[7])
 		end
 
-		local scoreTable = getScoreTable(tonumber(t[1]), flags)
+		local scoreTable = getScoreTable(tonumber(t[1]), flags) or {}
 
 		local spl = {}
 		if t[6] != nil then
@@ -865,7 +865,7 @@ end
 
 -- Find location of player and scroll to it
 function scroll_to(player)
-	local m = getScoreTable(gamemap, Flags)
+	local m = getScoreTable(gamemap, Flags) or {}
 
 	scrollToPos = 2
 	for pos, score in ipairs(m) do
@@ -879,7 +879,7 @@ function scroll_to(player)
 end
 
 local function saveTime(player)
-	local scoreTable = getScoreTable(gamemap, Flags)
+	local scoreTable = getScoreTable(gamemap, Flags) or {}
 
 	local newscore = score_t(
 		gamemap,