Some exceptionHandling and test changes.