Yes, the laughter is a very good sign, I think.

When my husband starts snapping at me, I might say "alright you grumpy old man." He usually gets the message and we laugh about it later.