Change exception handling for future extensions.