How should I be reacting in this situation?

I've been in a similar situation before and getting mad rarely helps; it tends to drive him to want to smoke more. I do think that you deserve an apology for the patronizing and some honesty in regard to the "Case of the Mysterious Toilet ."