Improved The Exceptions