add exception handling
Merge pull request #3 from andrenarchy/master

exception handled