diff --git a/libraries/octree/src/OctreeEditPacketSender.cpp b/libraries/octree/src/OctreeEditPacketSender.cpp
index 7b84205691..b432a626ed 100644
--- a/libraries/octree/src/OctreeEditPacketSender.cpp
+++ b/libraries/octree/src/OctreeEditPacketSender.cpp
@@ -37,7 +37,11 @@ OctreeEditPacketSender::~OctreeEditPacketSender() {
 
 
 bool OctreeEditPacketSender::serversExist() const {
-    auto node = DependencyManager::get<NodeList>()->soloNodeOfType(getMyNodeType());
+    auto nodeList = DependencyManager::get<NodeList>();
+    if(!nodeList) {
+        return false;
+    }
+    auto node = nodeList->soloNodeOfType(getMyNodeType());
     return node && node->getActiveSocket();
 }