Added extra Exceptions