Right now I hear "Don't try to make me laugh when I am mad."
"Don't try to make me laugh when I am mad. (what not to do). Say ____ instead to me. (what to do.)"
Could be easier on both if you told him both examples of behavior TO do and behavior NOT do.
It is a process. You will get there. Hang in there.