exception treatment changed
Merge pull request #36 from xmnfw/patch-1

exception treatment changed