Updating some things for exceptions handing and tests.