[master] Exception handling related patches