Exception functionality added