More changes to the exception handling...