diff --git a/3d_armor/api.lua b/3d_armor/api.lua
index c2bf89a..66b9885 100644
--- a/3d_armor/api.lua
+++ b/3d_armor/api.lua
@@ -14,8 +14,29 @@ armor = {
 		default.get_hotbar_bg(0, 4.7)..
 		"list[current_player;main;0,4.7;8,1;]"..
 		"list[current_player;main;0,5.85;8,3;8]",
-	def = {},
-	textures = {},
+	def = setmetatable({}, {
+		__index = function()
+			return setmetatable({
+				groups = setmetatable({}, {
+					__index = function()
+						return 0
+					end})
+				}, {
+				__index = function()
+					return 0
+				end
+			})
+		end,
+	}),
+	textures = setmetatable({}, {
+		__index = function()
+			return setmetatable({}, {
+				__index = function()
+					return "blank.png"
+				end
+			})
+		end
+	}),
 	default_skin = "character",
 	materials = {
 		wood = "group:wood",
@@ -199,6 +220,7 @@ armor.init_player_armor = function(self, player)
 		self:run_callbacks("on_equip", player, stack)
 	end
 	self.def[name] = {
+		init_time = minetest.get_gametime(),
 		level = 0,
 		state = 0,
 		count = 0,
@@ -464,15 +486,15 @@ armor.get_preview = function(self, name)
 end
 
 armor.get_armor_formspec = function(self, name, listring)
+	if armor.def[name].init_time == 0 then
+		return "label[0,0;Armor not initialized!]"
+	end
 	local formspec = armor.formspec..
 		"list[detached:"..name.."_armor;armor;0,0.5;2,3;]"
 	if listring == true then
 		formspec = formspec.."listring[current_player;main]"..
 			"listring[detached:"..name.."_armor;armor]"
 	end
-	if not armor.def[name] or not armor.textures[name] then
-		return formspec
-	end
 	formspec = formspec:gsub("armor_preview", armor.textures[name].preview)
 	formspec = formspec:gsub("armor_level", armor.def[name].level)
 	for _, attr in pairs(self.attributes) do
diff --git a/3d_armor/init.lua b/3d_armor/init.lua
index 5b3933e..a86b650 100644
--- a/3d_armor/init.lua
+++ b/3d_armor/init.lua
@@ -139,7 +139,7 @@ end)
 minetest.register_on_joinplayer(function(player)
 	default.player_set_model(player, "3d_armor_character.b3d")
 	if armor:init_player_armor(player) == false then
-		table.insert(pending_players, {player, 0})
+		pending_players[player] = 0
 	end
 end)
 
@@ -149,11 +149,7 @@ minetest.register_on_leaveplayer(function(player)
 		armor.def[name] = nil
 		armor.textures[name] = nil
 	end
-	for i, con in pairs(pending_players) do
-		if player == con[1] then
-			table.remove(pending_players, i)
-		end
-	end
+	pending_players[player] = nil
 end)
 
 if armor.config.drop == true or armor.config.destroy == true then
@@ -209,7 +205,7 @@ if armor.config.punch_damage == true then
 	minetest.register_on_punchplayer(function(player, hitter,
 			time_from_last_punch, tool_capabilities)
 		local name = player:get_player_name()
-		if name and armor.def[name] then
+		if name then
 			armor:punch(player, hitter, time_from_last_punch, tool_capabilities)
 			last_punch_time[name] = minetest.get_gametime()
 		end
@@ -219,8 +215,8 @@ end
 minetest.register_on_player_hpchange(function(player, hp_change)
 	if player and hp_change < 0 then
 		local name = player:get_player_name()
-		if name and armor.def[name] then
-			local heal = armor.def[name].heal or 0
+		if name then
+			local heal = armor.def[name].heal
 			heal = heal * armor.config.heal_multiplier
 			if heal >= math.random(100) then
 				hp_change = 0
@@ -238,15 +234,15 @@ end, true)
 minetest.register_globalstep(function(dtime)
 	timer = timer + dtime
 	if timer > armor.config.init_delay then
-		for i, con in pairs(pending_players) do
-			local remove = armor:init_player_armor(con[1]) == true
-			con[2] = con[2] + 1
-			if remove == false and con[2] > armor.config.init_times then
+		for player, count in pairs(pending_players) do
+			local remove = armor:init_player_armor(player) == true
+			pending_players[player] = count + 1
+			if remove == false and count > armor.config.init_times then
 				minetest.log("warning", "3d_armor: Failed to initialize player")
 				remove = true
 			end
 			if remove == true then
-				table.remove(pending_players, i)
+				pending_players[player] = nil
 			end
 		end
 		timer = 0
@@ -281,7 +277,7 @@ if armor.config.water_protect == true or armor.config.fire_protect == true then
 			end
 			-- water breathing
 			if armor.config.water_protect == true then
-				if armor.def[name] and armor.def[name].water > 0 and
+				if armor.def[name].water > 0 and
 						player:get_breath() < 10 then
 					player:set_breath(10)
 				end
diff --git a/3d_armor_ui/init.lua b/3d_armor_ui/init.lua
index 3493f67..763e731 100644
--- a/3d_armor_ui/init.lua
+++ b/3d_armor_ui/init.lua
@@ -27,24 +27,24 @@ unified_inventory.register_page("armor", {
 	get_formspec = function(player, perplayer_formspec)
 		local fy = perplayer_formspec.formspec_y
 		local name = player:get_player_name()
+		if armor.def[name].init_time == 0 then
+			return {formspec="label[0,0;Armor not initialized!]"}
+		end
 		local formspec = "background[0.06,"..fy..";7.92,7.52;3d_armor_ui_form.png]"..
-			"label[0,0;Armor]"
-		if armor.def[name] then
-			formspec = formspec..
+			"label[0,0;Armor]"..
 			"list[detached:"..name.."_armor;armor;0,"..fy..";2,3;]"..
 			"image[2.5,"..(fy - 0.25)..";2,4;"..armor.textures[name].preview.."]"..
 			"label[5.0,"..(fy + 0.0)..";"..S("Level")..": "..armor.def[name].level.."]"..
 			"label[5.0,"..(fy + 0.5)..";"..S("Heal")..":  "..armor.def[name].heal.."]"..
 			"listring[current_player;main]"..
 			"listring[detached:"..name.."_armor;armor]"
-			if armor.config.fire_protect then
-				formspec = formspec.."label[5.0,"..(fy + 1.0)..";"..
-					S("Fire")..":  "..armor.def[name].fire.."]"
-			end
-			if minetest.global_exists("technic") then
-				formspec = formspec.."label[5.0,"..(fy + 1.5)..";"..
-					S("Radiation")..":  "..armor.def[name].groups["radiation"].."]"
-			end
+		if armor.config.fire_protect then
+			formspec = formspec.."label[5.0,"..(fy + 1.0)..";"..
+				S("Fire")..":  "..armor.def[name].fire.."]"
+		end
+		if minetest.global_exists("technic") then
+			formspec = formspec.."label[5.0,"..(fy + 1.5)..";"..
+				S("Radiation")..":  "..armor.def[name].groups["radiation"].."]"
 		end
 		return {formspec=formspec}
 	end,
diff --git a/wieldview/init.lua b/wieldview/init.lua
index 3ad2932..8fcf001 100644
--- a/wieldview/init.lua
+++ b/wieldview/init.lua
@@ -57,10 +57,8 @@ wieldview.update_wielded_item = function(self, player)
 		if self.wielded_item[name] == item then
 			return
 		end
-		if armor.textures[name] then
-			armor.textures[name].wielditem = self:get_item_texture(item)
-			armor:update_player_visuals(player)
-		end
+		armor.textures[name].wielditem = self:get_item_texture(item)
+		armor:update_player_visuals(player)
 	end
 	self.wielded_item[name] = item
 end