YES—they have been setting up that trope since the Pilot. Danny has come so far from who he was in the early episodes (where he thought that work was exclusively for work and not for gossip). I wish more people respected Danny's character progression rather than rag on him for being human and getting scared.