--- a/main_gui.c	Thu Aug 30 21:06:52 2007 +0000
+++ b/main_gui.c	Sun Sep 09 16:59:56 2007 +0000
@@ -1864,9 +1864,10 @@
 		break;
 	}
 
-		case WE_MESSAGE:
-			HandleZoomMessage(w, FindWindowById(WC_MAIN_WINDOW, 0)->viewport, 17, 18);
-			break;
+		case WE_MESSAGE: {
+			Window *w2 = FindWindowById(WC_MAIN_WINDOW, 0);
+			if (w2 != NULL) HandleZoomMessage(w, w2->viewport, 17, 18);
+		} break;
 	}
 }
 

--- a/vehicle.c	Thu Aug 30 21:06:52 2007 +0000
+++ b/vehicle.c	Sun Sep 09 16:59:56 2007 +0000
@@ -2098,6 +2098,7 @@
 			new_v->profit_this_year = old_v->profit_this_year;
 			new_v->profit_last_year = old_v->profit_last_year;
 			new_v->service_interval = old_v->service_interval;
+			new_v->load_status      = old_v->load_status;
 			new_front = true;
 			new_v->unitnumber = old_v->unitnumber; // use the same unit number
 			new_v->dest_tile  = old_v->dest_tile;