Added exceptions to separate files