From fd1cfadc473003a71e607192977e960f6e21c9d8 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Fri, 11 Sep 2015 12:02:57 -0700
Subject: [PATCH] Fixing potential access to null object

---
 .../entities/src/EntityScriptingInterface.cpp  | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp
index 2c1753c8e7..463aed7d38 100644
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
@@ -568,15 +568,17 @@ bool EntityScriptingInterface::actionWorker(const QUuid& entityID,
     });
 
     // transmit the change
-    EntityItemProperties properties;
-    _entityTree->withReadLock([&] {
-        properties = entity->getProperties();
-    });
+    if (success) {
+        EntityItemProperties properties;
+        _entityTree->withReadLock([&] {
+            properties = entity->getProperties();
+        });
 
-    properties.setActionDataDirty();
-    auto now = usecTimestampNow();
-    properties.setLastEdited(now);
-    queueEntityMessage(PacketType::EntityEdit, entityID, properties);
+        properties.setActionDataDirty();
+        auto now = usecTimestampNow();
+        properties.setLastEdited(now);
+        queueEntityMessage(PacketType::EntityEdit, entityID, properties);
+    }
 
     return success;
 }