diff --git a/indra/newview/particleeditor.cpp b/indra/newview/particleeditor.cpp
index 5bd46077b2..5815c2c134 100644
--- a/indra/newview/particleeditor.cpp
+++ b/indra/newview/particleeditor.cpp
@@ -678,7 +678,10 @@ ParticleScriptCreationCallback::~ParticleScriptCreationCallback()
 
 void ParticleScriptCreationCallback::fire(const LLUUID& inventoryItem)
 {
-	mEditor->callbackReturned(inventoryItem);
+	if (mEditor)
+	{
+		mEditor->callbackReturned(inventoryItem);
+	}
 }
 
 // ---------------------------------- Responders ----------------------------------
@@ -696,5 +699,8 @@ ParticleScriptUploadResponder::ParticleScriptUploadResponder(const LLSD& post_da
 void ParticleScriptUploadResponder::uploadComplete(const LLSD& content)
 {
 	LLUpdateAgentInventoryResponder::uploadComplete(content);
-	mEditor->scriptInjectReturned(content);
+	if (mEditor)
+	{
+		mEditor->scriptInjectReturned(content);
+	}
 }