Exceptions refactored for new folder