[bob jenkins]

Yes, Todd, that's correct. Switch the arrow as soon as the throw in is completed or the throwing team violates. Then deal with the subsequent action (e.g., the throw in because of the violation).