From 91e27db9b0acde3e1a2e5d817d2a2d8f1b1ceb11 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz <orenh@kitely.com>
Date: Tue, 17 Apr 2018 12:32:28 +0300
Subject: [PATCH] When importing entities from JSON: fixed a null pointer
 exception if addEntity() failed on any of the entities

---
 libraries/entities/src/EntityTree.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index 9c7b46dc17..967d692bdd 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -2282,7 +2282,10 @@ bool EntityTree::sendEntitiesOperation(const OctreeElementPointer& element, void
         if (args->otherTree) {
             args->otherTree->withWriteLock([&] {
                 EntityItemPointer entity = args->otherTree->addEntity(newID, properties);
-                entity->deserializeActions();
+                if (entity) {
+                    entity->deserializeActions();
+                }
+                // else: there was an error adding this entity
             });
         }
         return newID;