NotFound partner-swapping