diff --git a/roadveh_cmd.c b/roadveh_cmd.c
index 93f6927a17..fb078b1744 100644
--- a/roadveh_cmd.c
+++ b/roadveh_cmd.c
@@ -1697,8 +1697,11 @@ void OnNewDay_RoadVeh(Vehicle *v)
 		//We do not have a slot, so make one
 		if (v->u.road.slot == NULL) {
 			//first we need to find out how far our stations are away.
-			if ( rs == NULL )
+			if ( rs == NULL ) {
+				free(firststop);
+				firststop = stop = NULL;
 				goto no_stop;
+			}
 
 			DEBUG(ms, 2) ("Multistop: Attempting to obtain a slot for vehicle %d at station %d (0x%x)", v->unitnumber, st->index, st->xy);
 			do {
diff --git a/train_cmd.c b/train_cmd.c
index 5aa0ed2bcf..6830225383 100644
--- a/train_cmd.c
+++ b/train_cmd.c
@@ -131,6 +131,9 @@ static int GetTrainAcceleration(Vehicle *v, bool mode)
 		sum += dist[i];
 	}
 
+	free(dist);
+	dist = NULL;
+
 	if (numcurve > 0) {
 		sum /= numcurve;
 	}