diff -r a79082c2a28e -r 651d56a6e568 hedgewars/GSHandlers.inc
--- a/hedgewars/GSHandlers.inc	Sat Aug 18 18:58:41 2012 -0400
+++ b/hedgewars/GSHandlers.inc	Tue Aug 21 13:26:26 2012 +0400
@@ -923,7 +923,13 @@
             Gear^.State := Gear^.State or gstAnimation
             end;
             exit
-        end
+        end else
+        if(Gear^.Hedgehog^.Gear = nil) or ((Gear^.Hedgehog^.Gear^.State and gstMoving) <> 0) then
+            begin
+            DeleteGear(Gear);
+            AfterAttack;
+            exit
+            end
     else
         inc(Gear^.Timer);