CONN-1375 Added null check for unknown server type