Merge pull request #21 from aelgru/master

Test coverage for the most important exceptions.