diff --git a/src/economy.cpp b/src/economy.cpp
index 79283e6640..329fdcbc30 100644
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -1552,7 +1552,7 @@ void VehiclePayment(Vehicle *front_v)
  */
 static void LoadUnloadVehicle(Vehicle *v, int *cargo_left)
 {
-	assert(v->current_order.type == OT_LOADING);
+	assert(v->current_order.IsType(OT_LOADING));
 
 	/* We have not waited enough time till the next round of loading/unloading */
 	if (--v->load_unload_time_rem != 0) {
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index 15c7c10071..c81baf4b6d 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -3164,7 +3164,7 @@ void Vehicle::BeginLoading()
 
 void Vehicle::LeaveStation()
 {
-	assert(current_order.type == OT_LOADING);
+	assert(current_order.IsType(OT_LOADING));
 
 	/* Only update the timetable if the vehicle was supposed to stop here. */
 	if (current_order.flags & OFB_NON_STOP) UpdateVehicleTimetable(this, false);