Updated to comply with new CH exception handling.