From eed388e7c9e71f81e158e4c66b1e1da240a04a54 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Mon, 26 Feb 2018 13:53:14 -0800
Subject: [PATCH] avoid a crash if entityTree is null

---
 libraries/entities/src/EntityEditPacketSender.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/entities/src/EntityEditPacketSender.cpp b/libraries/entities/src/EntityEditPacketSender.cpp
index 2ef7f1821b..5d7bd61854 100644
--- a/libraries/entities/src/EntityEditPacketSender.cpp
+++ b/libraries/entities/src/EntityEditPacketSender.cpp
@@ -91,7 +91,7 @@ void EntityEditPacketSender::queueEditEntityMessage(PacketType type,
         return;
     }
 
-    if (entityTree->isServerlessMode()) {
+    if (entityTree && entityTree->isServerlessMode()) {
         // if we are in a serverless domain, don't send edit packets
         return;
     }