You can try to not offend him over the things he gets upset about. Apologize and let him know through both your words and actions that you don't want to bring up things that offend him. Then talk to him to learn about why these things offend him so that you will better understand why it's important to him.