--- a/order_gui.c	Tue Feb 01 09:36:07 2005 +0000
+++ b/order_gui.c	Tue Feb 01 09:47:18 2005 +0000
@@ -458,11 +458,12 @@
 
 	case WE_RCLICK: {
 		Vehicle *v = GetVehicle(w->window_number);
-		if (e->click.widget != 8) break;
-		if (GetVehicleOrder(v, OrderGetSel(w))->type == OT_GOTO_DEPOT)
+		int sel = OrderGetSel(w);
+ 		if (e->click.widget != 8) break;
+		if (sel == v->num_orders || GetVehicleOrder(v, sel)->type != OT_GOTO_DEPOT)
+			GuiShowTooltips(STR_8857_MAKE_THE_HIGHLIGHTED_ORDER);
+		else
 			GuiShowTooltips(STR_SERVICE_HINT);
-		else
-			GuiShowTooltips(STR_8857_MAKE_THE_HIGHLIGHTED_ORDER);
 	} break;
 
 	case WE_4: {