BZ1072337: Fix recovery from verify connection failed