Updating: improving handling of raised exception.