Move null check for arrival info so we don't block visibility of distance to stop