Changed exit to throw a new Exception
Merge pull request #3 from Farkie/master

Added Exceptions