Slight refactor, fix up throw in SendVesselUpdates and RemoveVessels