Don't make him upset. This step is to cope with the long-term relationship. Try to find out what is causing them bad temper and avoid doing what they does not like. If the problem is caused by someone in the organization. You may organize training on communication with others, or to resolve conflicts in an organization.