Refactored exceptions
Merge pull request #77 from GrahamCampbell/exception-refactor

Refactored Exceptions