Exception should be correctly set
Merge pull request #131 from Remper/master

Exception should be correctly set