Merge "Guard against null server" into pi-dev