--- a/hedgewars/CCHandlers.inc	Sun Aug 16 11:55:41 2009 +0000
+++ b/hedgewars/CCHandlers.inc	Sun Aug 16 11:56:10 2009 +0000
@@ -355,10 +355,9 @@
 
 procedure chTimer(var s: shortstring);
 begin
-if (s[0] <> #1) or (s[1] < '1') or (s[1] > '5')
-	or (CurrentTeam = nil)
-	or (CurrentHedgehog^.Gear = nil) then exit;
+if (s[0] <> #1) or (s[1] < '1') or (s[1] > '5') or CheckNoTeamOrHH then exit;
 bShowFinger:= false;
+
 if not CurrentTeam^.ExtDriven then SendIPC(s);
 with CurrentHedgehog^.Gear^ do
      begin