Fix server connection NPE