Improve error messages

--HG--
extra : rebase_source : 70632016b4897335e120d1cb995bf1b4a02570c2