Generic error management
Merge branch 'master' into w3c_agent