Error handling improvement
Merge branch 'master' of https://github.com/jose-soler/james.git
Merge branch 'master' of https://github.com/jose-soler/james.git