Exception handling related changes