Tomorrow, when you're both home, sit down and calmly talk to him. He may have felt uncomfortable going with you, as the funeral was for your friend's mom, not a friend of his. Let him know how you feel, it can't hurt, right? If it's just symptomatic of how things have been lately, no time like the present to try to change things for the better, right?