From 69faebfcaede5ead1b0692b6622250de1843173b Mon Sep 17 00:00:00 2001
From: Andrey Samokhvalov <andrew.shvv@gmail.com>
Date: Sun, 19 Feb 2017 15:34:05 +0300
Subject: [PATCH] rpcserver: fix pendingchannels panic

---
 rpcserver.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/rpcserver.go b/rpcserver.go
index a37287f2..8fd1da6b 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -762,12 +762,17 @@ func (r *rpcServer) PendingChannels(ctx context.Context,
 	if includeOpen {
 		pendingOpenChans := r.server.fundingMgr.PendingChannels()
 		for _, pendingOpen := range pendingOpenChans {
+			channelPointStr := "<non initialized yet>"
+			if pendingOpen.channelPoint != nil {
+				channelPointStr = pendingOpen.channelPoint.String()
+			}
+
 			// TODO(roasbeef): add confirmation progress
 			pub := pendingOpen.identityPub.SerializeCompressed()
 			pendingChan := &lnrpc.PendingChannelResponse_PendingChannel{
 				PeerId:        pendingOpen.peerId,
 				IdentityKey:   hex.EncodeToString(pub),
-				ChannelPoint:  pendingOpen.channelPoint.String(),
+				ChannelPoint:  channelPointStr,
 				Capacity:      int64(pendingOpen.capacity),
 				LocalBalance:  int64(pendingOpen.localBalance),
 				RemoteBalance: int64(pendingOpen.remoteBalance),