Updated exceptions
Updated exceptions