CON-137: Prevent blocking on failed Upgrade2