I wouldn't say it "easily makes up" just for one scene. The first two seasons were way more comedy than this. This season really picked up in the last half after a relatively slow start.
I just hate how everyone shows up at the perfect time for a surprise in the scene. Felt like that happened...