Try to fix socket NPE