Improve error management
Merge branch 'error-http-improve'