Merge pull request #44 from paramite/master

Fixed exception issues