--- a/hedgewars/HHHandlers.inc	Sat May 09 11:56:46 2009 +0000
+++ b/hedgewars/HHHandlers.inc	Sat May 09 11:57:47 2009 +0000
@@ -716,7 +716,8 @@
 	doStepHedgehogFree(Gear)
 else
 	begin
-	TeamGoneEffect(PHedgehog(Gear^.Hedgehog)^.Team^);
+	with PHedgehog(Gear^.Hedgehog)^ do
+		if Team^.hasGone then TeamGoneEffect(Team^);
 	doStepHedgehogDriven(Gear)
 	end
 end;