Correct indentation and add new Exceptions