Improved error reporting

--HG--
extra : rebase_source : 8d4066e8b59ec039597cb046f95af63b3bdf5d3a