exceptions coverage to 100% + a little pylint
Merge pull request #224 from kstrauser/exceptions-cleanup

Exceptions cleanup