Correctable error with substitution

[tjchamp]

Team a is in the bonus (1 + 1) when a1 gets fouled. However, the officials are not notified/aware of the free throw situation. A6 enters as a sub for a1. Ball is inbounded, then A coach realizes he is in bonus situation and calls timeout so he can get his free throws.

1. Does a1 come back into the game at that point to shoot his ft's?
2. Does you answer change if a1 picks up a T on his way to the bench (he was bench personnel at this point) for his 5th foul?