This could just be a one-off.

I think you two need to see a counsellor just to open the lines of communication. Maybe he just really hates that name that you called him?

It's good that you have a back-up plan to get out of there if it happens again though. Although it's sad that you have to live with a get-out plan like you're always waiting for something to happen.