Improve throw exception