Some exceptions changes.