try handle error
Merge pull request #1 from lmazardo/master

try handle error