fix except issue
Merge pull request #605 from AlexLakatos/master

fix except issue