Index: server/gotohand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/gotohand.c,v
retrieving revision 1.155
diff -u -r1.155 gotohand.c
--- server/gotohand.c	2 Nov 2002 13:53:08 -0000	1.155
+++ server/gotohand.c	6 Nov 2002 22:09:58 -0000
@@ -1264,14 +1264,14 @@
   dest_x = waypoint_x = punit->goto_dest_x;
   dest_y = waypoint_y = punit->goto_dest_y;
 
-  if (same_pos(punit->x, punit->y, dest_x, dest_y) ||
-      !goto_is_sane(punit, dest_x, dest_y, FALSE)) {
+  if (same_pos(punit->x, punit->y, dest_x, dest_y)) {
     punit->activity = ACTIVITY_IDLE;
     punit->connecting = FALSE;
     send_unit_info(NULL, punit);
     if (same_pos(punit->x, punit->y, dest_x, dest_y)) {
       return GR_ARRIVED;
-    } else {
+  }
+  if (!goto_is_sane(punit, dest_x, dest_y, FALSE)) {
       return GR_FAILED;
     }
   }