--- a/share/hedgewars/Data/Scripts/Multiplayer/Construction_Mode.lua	Wed Apr 13 02:44:37 2016 +0200
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Construction_Mode.lua	Wed Apr 13 02:54:36 2016 +0200
@@ -860,7 +860,7 @@
 	-- this is kinda messy and gross (even more than usual), fix it up at some point
 	-- it just assumes that if you have access to girders, it works for rubbers
 	-- as that is what the struc implemenation means due to construction station
-	if GameTime % 100 == 0 then
+	if GameTime % 100 == 0 and CurrentHedgehog ~= nil then
 		anyUIProx = false
 		for i = 1, #sProx do
 
@@ -1046,8 +1046,6 @@
 local pMode = {}	-- pMode contains custom subsets of the main categories
 local pIndex = 1
 
-local genTimer = 0
-
 local CGR = 1 -- current girder rotation, we actually need this as HW remembers what rotation you last used
 
 local placedX = {}
@@ -1241,11 +1239,7 @@
 			end
 		end
 
-		genTimer = genTimer + 1
-
-		if genTimer >= 100 then
-
-			genTimer = 0
+		if GameTime % 100 == 0 then
 
 			DrawTag(1)