Changed some exceptions