Changed some exception references