Fixed use of incorrect exception class.
Moved to own package.