diff --git a/api.lua b/api.lua
index 3214cb0..c399770 100644
--- a/api.lua
+++ b/api.lua
@@ -35,10 +35,11 @@ end
 -- A table of award definitions
 awards.def = {}
 
-function awards.tbv(tb,value,default)
-	if not default then
-		default = {}
-	end
+function awards.tbv(tb,value)
+	awards.tbv_default(tb,value,{})
+end
+
+function awards.tbv_default(tb,value,default)
 	if not tb or type(tb) ~= "table" then
 		if not value then
 			value = "[NULL]"
diff --git a/triggers.lua b/triggers.lua
index b13ff93..0121768 100644
--- a/triggers.lua
+++ b/triggers.lua
@@ -140,6 +140,7 @@ minetest.register_on_dieplayer(function(player)
 	if not player or not player:get_player_name() or player:get_player_name()=="" then
 		return
 	end
+	local playern = player:get_player_name()
 	awards.tbv(awards.players,				playern			)
 	awards.tbv(awards.players[playern],		"name",		playern	)
 	awards.tbv(awards.players[playern],		"deaths",	0	)
@@ -148,7 +149,6 @@ minetest.register_on_dieplayer(function(player)
         awards.players[player:get_player_name()].deaths = awards.players[player:get_player_name()].deaths + 1
 	
 	-- Run callbacks and triggers
-	local playern=player:get_player_name()
 	local data=awards.players[playern]
 	for i=1,# awards.onDeath do
 		local res=nil
@@ -179,8 +179,9 @@ minetest.register_on_dieplayer(function(player)
 end)
 
 minetest.register_on_newplayer(function(player)
-	awards.tbv(awards.players, player:get_player_name())
-	awards.tbv(awards.players[playern], "name", player:get_player_name())
+	local playern = player:get_player_name()
+	awards.tbv(awards.players, playern)
+	awards.tbv(awards.players[playern], "name", playern)
 	awards.tbv(awards.players[playern], "unlocked")
 	awards.tbv(awards.players[playern], "place")
 	awards.tbv(awards.players[playern], "count")