diff --git a/pkg/networkservice/common/monitor/eventloop.go b/pkg/networkservice/common/monitor/eventloop.go
index 8e108c01a..bfe84a1d9 100644
--- a/pkg/networkservice/common/monitor/eventloop.go
+++ b/pkg/networkservice/common/monitor/eventloop.go
@@ -91,14 +91,17 @@ func (cev *eventLoop) eventLoop() {
 		connOut := cev.conn.Clone()
 		if err != nil && connOut != nil {
 			// If we get an error, we've lost our connection... Send Down update
-			connOut.State = networkservice.State_DOWN
-			eventOut := &networkservice.ConnectionEvent{
-				Type: networkservice.ConnectionEventType_UPDATE,
-				Connections: map[string]*networkservice.Connection{
-					cev.conn.GetId(): connOut,
-				},
+			connOut := cev.conn.Clone()
+			if connOut != nil {
+				connOut.State = networkservice.State_DOWN
+				eventOut := &networkservice.ConnectionEvent{
+					Type: networkservice.ConnectionEventType_UPDATE,
+					Connections: map[string]*networkservice.Connection{
+						cev.conn.GetId(): connOut,
+					},
+				}
+				_ = cev.eventConsumer.Send(eventOut)
 			}
-			_ = cev.eventConsumer.Send(eventOut)
 			return
 		}
 		_ = cev.eventConsumer.Send(eventIn)
diff --git a/pkg/networkservice/common/monitor/server.go b/pkg/networkservice/common/monitor/server.go
index 01240a3f9..a8d5daa94 100644
--- a/pkg/networkservice/common/monitor/server.go
+++ b/pkg/networkservice/common/monitor/server.go
@@ -25,7 +25,6 @@ import (
 
 	"github.com/golang/protobuf/ptypes/empty"
 
-	"github.com/networkservicemesh/sdk/pkg/networkservice/common/clientconn"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/utils/metadata"
 
 	"github.com/networkservicemesh/api/pkg/api/networkservice"
@@ -56,6 +55,7 @@ func NewServer(chainCtx context.Context, monitorServerPtr *networkservice.Monito
 }
 
 func (m *monitorServer) Request(ctx context.Context, request *networkservice.NetworkServiceRequest) (*networkservice.Connection, error) {
+	// closeCtxFunc := postpone.ContextWithValues(ctx)
 	// Cancel any existing eventLoop
 	cancelEventLoop, loaded := loadAndDelete(ctx, metadata.IsClient(m))
 	if loaded {
@@ -83,11 +83,20 @@ func (m *monitorServer) Request(ctx context.Context, request *networkservice.Net
 
 	// If we have a clientconn ... we must be part of a passthrough server, and have a client to pass
 	// events through from, so start an eventLoop
-	cc, ccLoaded := clientconn.Load(ctx)
-	if ccLoaded {
-		cancelEventLoop := newEventLoop(m.chainCtx, m.MonitorConnectionServer.(EventConsumer), cc, conn)
-		store(ctx, metadata.IsClient(m), cancelEventLoop)
-	}
+	// cc, ccLoaded := clientconn.Load(ctx)
+	// log.FromContext(ctx).Infof("ccLoaded")
+	// if ccLoaded {
+	// 	log.FromContext(ctx).Infof("newEventLoop")
+	// 	cancelEventLoop, eventLoopErr := newEventLoop(m.chainCtx, m.MonitorConnectionServer.(EventConsumer), cc, conn)
+	// 	if eventLoopErr != nil {
+	// 		closeCtx, closeCancel := closeCtxFunc()
+	// 		defer closeCancel()
+	// 		_, _ = next.Client(closeCtx).Close(closeCtx, conn)
+	// 		return nil, errors.Wrap(eventLoopErr, "unable to monitor")
+	// 	}
+	// 	log.FromContext(ctx).Infof("STORE")
+	// 	store(ctx, metadata.IsClient(m), cancelEventLoop)
+	// }
 
 	return conn, nil
 }
diff --git a/pkg/networkservice/common/updatepath/client.go b/pkg/networkservice/common/updatepath/client.go
index 9c71cf83a..ea527ad96 100644
--- a/pkg/networkservice/common/updatepath/client.go
+++ b/pkg/networkservice/common/updatepath/client.go
@@ -56,9 +56,14 @@ func (i *updatePathClient) Request(ctx context.Context, request *networkservice.
 		return nil, err
 	}
 
-	if conn.GetPath() != nil && len(conn.GetPath().GetPathSegments()) > int(index) {
-		conn.Id = conn.GetPath().GetPathSegments()[index].Id
-		conn.GetPath().Index = index
+	segments := conn.GetPath().GetPathSegments()
+	if segments != nil && len(segments) > int(index) {
+		conn.Id = segments[index].Id
+	}
+
+	path := conn.GetPath()
+	if path != nil {
+		path.Index = index
 	}
 
 	return conn, nil