catching error
Merge pull request #110 from glenwks/master

catching error