I think it Depends on the Context you use it In!
For Example You said:
Which is Correct but because your teacher used it in a different context she is also correct!So if someone says "Don't make me upset!" than the person means "Don't make me angry!".