Updated exceptions.
Reverted exceptions.