Simple refactor
Don't rescue any exception removing overenginered solution