Be more robust about version hotswap failures.