Added & modified exceptions