* Exception cleanup after desing fixing as well as tests.