renamed some exceptions