Enhancements and more on exceptions handling