change in exception handling