On my first playthrough, I was actually expecting this to happen, since Saber was so adamant about protecting Shirou at school.

For a moment, I read your comment and thought that there was another (doujin) game with Saber at school, and that you were expecting this to happen in the game.

I must say, I'm slightly disappointed, now that I have re-read your comment.