Exceptions refactored, mistape fixed