Add current server check to failed listener too