From 42ef1f5ee3a214341de3fdbfb03a82140cf48609 Mon Sep 17 00:00:00 2001
From: Owen <owen@txv.io>
Date: Thu, 19 Mar 2026 15:21:50 -0700
Subject: [PATCH] Fix nil pointer deference

---
 olm/peer.go | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/olm/peer.go b/olm/peer.go
index fca47b5..7ec3b95 100644
--- a/olm/peer.go
+++ b/olm/peer.go
@@ -20,6 +20,11 @@ func (o *Olm) handleWgPeerAdd(msg websocket.WSMessage) {
 		return
 	}
 
+	if o.peerManager == nil {
+		logger.Debug("Ignoring add-peer message: peerManager is nil (shutdown in progress)")
+		return
+	}
+
 	jsonData, err := json.Marshal(msg.Data)
 	if err != nil {
 		logger.Error("Error marshaling data: %v", err)
@@ -76,6 +81,11 @@ func (o *Olm) handleWgPeerRemove(msg websocket.WSMessage) {
 		return
 	}
 
+	if o.peerManager == nil {
+		logger.Debug("Ignoring remove-peer message: peerManager is nil (shutdown in progress)")
+		return
+	}
+
 	jsonData, err := json.Marshal(msg.Data)
 	if err != nil {
 		logger.Error("Error marshaling data: %v", err)
@@ -113,6 +123,11 @@ func (o *Olm) handleWgPeerUpdate(msg websocket.WSMessage) {
 		return
 	}
 
+	if o.peerManager == nil {
+		logger.Debug("Ignoring update-peer message: peerManager is nil (shutdown in progress)")
+		return
+	}
+
 	jsonData, err := json.Marshal(msg.Data)
 	if err != nil {
 		logger.Error("Error marshaling data: %v", err)