Added incorrectly named exceptions