Multiple classes updated.----added exceptions and checks.