better handle the errors
Merge branch 'master' of github.com:bbtfr/shortener