Core Exception handling added