diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 9b660b65d7..9fb11d3747 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2729,7 +2729,9 @@ namespace OpenSim.Region.Framework.Scenes
             if (ParentGroup == null)
                 return;
 
-            ParentGroup.Scene.EventManager.TriggerSceneObjectPartUpdated(this);
+            // When running OpenSim tests, EventManager can be null. Maybe tests should create an EventManager.
+            if(ParentGroup.Scene.EventManager != null)
+                ParentGroup.Scene.EventManager.TriggerSceneObjectPartUpdated(this);
 
             ParentGroup.QueueForUpdateCheck();
 
@@ -2763,7 +2765,9 @@ namespace OpenSim.Region.Framework.Scenes
             if (ParentGroup == null)
                 return;
 
-            ParentGroup.Scene.EventManager.TriggerSceneObjectPartUpdated(this);
+            // When running OpenSim tests, EventManager can be null. Maybe tests should create an EventManager.
+            if (ParentGroup.Scene.EventManager != null)
+                ParentGroup.Scene.EventManager.TriggerSceneObjectPartUpdated(this);
 
             // This was pulled from SceneViewer. Attachments always receive full updates.
             // I could not verify if this is a requirement but this maintains existing behavior