Reorder exceptions.
Update for all cases.
Fixed reorder warnings.