diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index 1f4ec9656c..f04ed4df13 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@@ -106,7 +106,7 @@ namespace OpenSim.Region.Framework.Scenes
                         g.ScheduleFullUpdateToAvatar(m_presence);
                 }
 
-                while (m_partsUpdateQueue.Count != null && m_partsUpdateQueue.Count > 0)
+                while (m_partsUpdateQueue != null && m_partsUpdateQueue.Count != null && m_partsUpdateQueue.Count > 0)
                 {
                     SceneObjectPart part = m_partsUpdateQueue.Dequeue();