Better handling of the error case where a booking may be saved without unit type.