Removes superfluous exception and renames base exception
Fixes issue 17 and issue 9