Added extra exceptions.