From 9f7b38375771d803223bd9493893a2f36da30ac3 Mon Sep 17 00:00:00 2001
From: Livi Erickson <livi@outlook.com>
Date: Sun, 20 May 2018 18:22:17 -0700
Subject: [PATCH] address CR feedback

---
 libraries/entities/src/EntityTree.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index 52e8fe164b..8fa13c5618 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -1457,12 +1457,13 @@ int EntityTree::processEditPacketData(ReceivedMessage& message, const unsigned c
             if (isClone) {
                 QByteArray buffer = QByteArray::fromRawData(reinterpret_cast<const char*>(editData), maxLength);
                 validEditPacket = EntityItemProperties::decodeCloneEntityMessage(buffer, processedBytes, entityIDToClone, entityItemID);
-                entityToClone = findEntityByEntityItemID(entityIDToClone);
-                if (entityToClone) {
-                    properties = entityToClone->getProperties();
+                if (validEditPacket) {
+                    entityToClone = findEntityByEntityItemID(entityIDToClone);
+                    if (entityToClone) {
+                        properties = entityToClone->getProperties();
+                    }
                 }
-            }
-            else {
+            } else {
                 validEditPacket = EntityItemProperties::decodeEntityEditPacket(editData, maxLength, processedBytes, entityItemID, properties);
             }