re-fix exceptions
Merge pull request #56 from garak/clean-exception2

re-fix exceptions