change Exception handling