Removed use of Exception as defined in the coding standard