Exception handling feature added