squish bugs
Merge pull request #59 from newbrough/improve_exceptions

squish bugs