Exceptions added
More stuff to play with :)