This is a few chapters later, but that's still basically what happens. In the next chapter, he gets saved, but never knows it was Van at all. He doesn't get clued into this fact, until Chapter 40, and he still doesn't really believe it, when Panamera says it was probably Van.