Added exceptions, renamed a file