added relevant exceptions