No, he was supposed to die in episode 5.12 or 5.13. Instead Peter Weller and Carlos Bernard thought up the Henderson kills Tony storyline and the producers liked it so much they went along with it.
That is how they turned Henderson into "the most hated villain ever on 24".