On two ends of the world..

[TimeHeals]

I think you're right because it makes me feel like walking on eggshells.

Yep, he's right. The best time to deal with these things calmly and confidently is when they happen. Just tell him you don't appreciate that kind of behavior, and it's OK to say it makes you feel angry, hurt, whatever one-word feeling applies.