Fix NPE in disconnect path