From b9a174ab1507306fed5fa4ee70416e2489ef8fcb Mon Sep 17 00:00:00 2001
From: ncteisen <ncteisen@gmail.com>
Date: Tue, 11 Sep 2018 12:42:01 -0700
Subject: [PATCH] Add check on server for channelz accessor

---
 src/core/lib/surface/server.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc
index c0fae0f140d..5fa58ffdec2 100644
--- a/src/core/lib/surface/server.cc
+++ b/src/core/lib/surface/server.cc
@@ -1500,5 +1500,8 @@ int grpc_server_has_open_connections(grpc_server* server) {
 
 grpc_core::channelz::ServerNode* grpc_server_get_channelz_node(
     grpc_server* server) {
+  if (server == nullptr) {
+    return nullptr;
+  }
   return server->channelz_server.get();
 }