Updating: improving handling of raised exceptions.