Adapted to the Exceptions changes.
Formatted.
Formatted.