A better fix for #104

@fernandoacorreia What do you think?

I will later create a new issue regarding the error handling with Try.