What she says. Yes. This is how I read the book, in the same way and at the same points. I realised what Draco's mission was likely to be in chapter two and was mentally screaming at the good guys to figure it out and work around it.

Ah well.