Added error friendly
Merge branch 'master' of https://github.com/lgrassini/205