r21708 removes the bogus null checks of the server handle. r21709 cleans up the leaks of the server handle. (I forgot to put RT ticket headers in both commits; apologies.)