Remove references to deprecated Error module.

(grafted from 4edef51c3c36caec4e82634ff252db2f89e3560b)

--HG--
extra : source : 4edef51c3c36caec4e82634ff252db2f89e3560b