Add exception cases