Exceptions changes done