improve exceptions names